diff --git a/manifest.json b/manifest.json
index 86f2aa3..cc33b34 100644
--- a/manifest.json
+++ b/manifest.json
@@ -13,7 +13,10 @@
     "entry_point": "src/ipinfo_mcp/__main__.py",
     "mcp_config": {
       "command": "uv",
-      "args": ["run", "ipinfo-mcp-server"]
+      "args": ["run", "ipinfo-mcp-server"],
+      "env": {
+        "IPINFO_TOKEN": "${user_config.IPINFO_TOKEN}"
+      }
     }
   },
   "user_config": {
diff --git a/src/ipinfo_mcp/landing.html b/src/ipinfo_mcp/landing.html
index 73a1945..6a5ead4 100644
--- a/src/ipinfo_mcp/landing.html
+++ b/src/ipinfo_mcp/landing.html
@@ -1408,8 +1408,13 @@ <h2>Available Tools</h2>
                                     "mcp-remote",
                                     "https://mcp.ipinfo.io/",
                                     "--header",
-                                    "Authorization: Bearer " + tok,
+                                    // Claude Desktop on Windows doesn't escape spaces in args
+                                    // when it spawns npx, so keep them in an env var instead.
+                                    "Authorization:${AUTH_HEADER}",
                                 ],
+                                env: {
+                                    AUTH_HEADER: "Bearer " + tok,
+                                },
                             },
                         },
                     },