diff --git a/apps/login/src/lib/self.ts b/apps/login/src/lib/self.ts
index 8d6f9aac55..8be9a27368 100644
--- a/apps/login/src/lib/self.ts
+++ b/apps/login/src/lib/self.ts
@@ -7,14 +7,8 @@ import { getSessionCookieById } from "./cookies";
 import { getServiceUrlFromHeaders } from "./service-url";
 import { getSession } from "./zitadel";
 
-const transport = async (serviceUrl: string, token: string) => {
-  return createServerTransport(token, {
-    baseUrl: serviceUrl,
-  });
-};
-
 const myUserService = async (serviceUrl: string, sessionToken: string) => {
-  const transportPromise = await transport(serviceUrl, sessionToken);
+  const transportPromise = await createServerTransport(sessionToken, serviceUrl);
   return createUserServiceClient(transportPromise);
 };
 
diff --git a/apps/login/src/lib/server/password.ts b/apps/login/src/lib/server/password.ts
index 0ff31198fc..700c2f7b92 100644
--- a/apps/login/src/lib/server/password.ts
+++ b/apps/login/src/lib/server/password.ts
@@ -428,9 +428,7 @@ export async function checkSessionAndSetPassword({
     });
   } else {
     const transport = async (serviceUrl: string, token: string) => {
-      return createServerTransport(token, {
-        baseUrl: serviceUrl,
-      });
+      return createServerTransport(token, serviceUrl);
     };
 
     const myUserService = async (serviceUrl: string, sessionToken: string) => {
diff --git a/apps/login/src/lib/service.ts b/apps/login/src/lib/service.ts
index bbf50c9fdc..76fc178f67 100644
--- a/apps/login/src/lib/service.ts
+++ b/apps/login/src/lib/service.ts
@@ -43,24 +43,7 @@ export async function createServiceForHost<T extends ServiceClass>(
     throw new Error("No token found");
   }
 
-  const transport = createServerTransport(token, {
-    baseUrl: serviceUrl,
-    interceptors: !process.env.CUSTOM_REQUEST_HEADERS
-      ? undefined
-      : [
-          (next) => {
-            return (req) => {
-              process.env.CUSTOM_REQUEST_HEADERS!.split(",").forEach(
-                (header) => {
-                  const kv = header.split(":");
-                  req.header.set(kv[0], kv[1]);
-                },
-              );
-              return next(req);
-            };
-          },
-        ],
-  });
+  const transport = createServerTransport(token, serviceUrl);
 
   return createClientFor<T>(service)(transport);
 }