diff --git a/client/bin/client.js b/client/bin/client.js
index e25ecb7c..2a7419e6 100755
--- a/client/bin/client.js
+++ b/client/bin/client.js
@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 
+import open from "open";
 import { join, dirname } from "path";
 import { fileURLToPath } from "url";
 import handler from "serve-handler";
@@ -42,9 +43,12 @@ const server = http.createServer((request, response) => {
 const port = parseInt(process.env.CLIENT_PORT || "6274", 10);
 const host = process.env.HOST || "localhost";
 server.on("listening", () => {
-  console.log(
-    `🔍 MCP Inspector is up and running at http://${host}:${port} 🚀`,
-  );
+  const url = process.env.INSPECTOR_URL || `http://${host}:${port}`;
+  console.log(`\n🚀 MCP Inspector is up and running at:\n   ${url}\n`);
+  if (process.env.MCP_AUTO_OPEN_ENABLED !== "false") {
+    console.log(`🌐 Opening browser...`);
+    open(url);
+  }
 });
 server.on("error", (err) => {
   if (err.message.includes(`EADDRINUSE`)) {
diff --git a/client/bin/start.js b/client/bin/start.js
index 8fa246cb..507026cc 100755
--- a/client/bin/start.js
+++ b/client/bin/start.js
@@ -187,17 +187,12 @@ async function startProdClient(clientOptions) {
     SERVER_PORT,
   );
 
-  // Handle auto-open and logging
-  if (!cancelled) {
-    console.log(`\n🚀 MCP Inspector is up and running at:\n   ${url}\n`);
-    if (process.env.MCP_AUTO_OPEN_ENABLED !== "false") {
-      console.log(`\n🌐 Opening browser...:\n`);
-      open(url);
-    }
-  }
-
   await spawnPromise("node", [inspectorClientPath], {
-    env: { ...process.env, CLIENT_PORT: CLIENT_PORT },
+    env: {
+      ...process.env,
+      CLIENT_PORT: CLIENT_PORT,
+      INSPECTOR_URL: url,
+    },
     signal: abort.signal,
     echoOutput: true,
   });
diff --git a/server/src/index.ts b/server/src/index.ts
index 3e02cad1..971cf158 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -539,27 +539,9 @@ const server = app.listen(PORT, HOST);
 server.on("listening", () => {
   console.log(`⚙️ Proxy server listening on ${HOST}:${PORT}`);
   if (!authDisabled) {
-    console.log(`🔑 Session token: ${sessionToken}`);
     console.log(
-      `Use this token to authenticate requests or set DANGEROUSLY_OMIT_AUTH=true to disable auth`,
-    );
-
-    // Display clickable URL with pre-filled token
-    const clientPort = process.env.CLIENT_PORT || "6274";
-    const clientHost = process.env.HOST || "localhost";
-
-    // Build URL with query parameters
-    const params = new URLSearchParams();
-    params.set("MCP_PROXY_AUTH_TOKEN", sessionToken);
-
-    // Add server port if it's not the default
-    if (PORT !== parseInt(DEFAULT_MCP_PROXY_LISTEN_PORT, 10)) {
-      params.set("MCP_PROXY_PORT", PORT.toString());
-    }
-
-    const clientUrl = `http://${clientHost}:${clientPort}/?${params.toString()}`;
-    console.log(
-      `\n🔗 Open inspector with token pre-filled:\n   ${clientUrl}\n`,
+      `🔑 Session token: ${sessionToken}\n   ` +
+        `Use this token to authenticate requests or set DANGEROUSLY_OMIT_AUTH=true to disable auth`,
     );
   } else {
     console.log(