diff --git a/packages/builder/src/pages/builder/auth/_layout.svelte b/packages/builder/src/pages/builder/auth/_layout.svelte
index a66f029b16..0a955d6604 100644
--- a/packages/builder/src/pages/builder/auth/_layout.svelte
+++ b/packages/builder/src/pages/builder/auth/_layout.svelte
@@ -11,11 +11,11 @@
   }
 
   if ($admin?.checklist?.branding) {
-    let url = new URL("http://hello.petertest.com:10001/auth/login")
+    let url = new URL(window.location.href)
     let hostname = url.hostname
     let parts = hostname.split(".")
     let tenantId = parts[0]
-    CookieUtils.setCookie("tenantId", tenantId, "petertest.com")
+    CookieUtils.setCookie("tenantId", tenantId, domain)
   }
 
   if (