diff --git a/packages/account-portal b/packages/account-portal
index a851eeacab..ab324e35d8 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit a851eeacabfaad8bff6e781f5e5a62063cbc31f3
+Subproject commit ab324e35d855012bd0f49caa53c6dd765223c6fa
diff --git a/packages/builder/src/pages/builder/auth/_layout.svelte b/packages/builder/src/pages/builder/auth/_layout.svelte
index f5484182e8..1a40847aa0 100644
--- a/packages/builder/src/pages/builder/auth/_layout.svelte
+++ b/packages/builder/src/pages/builder/auth/_layout.svelte
@@ -10,13 +10,18 @@
     $redirect("../")
   }
 
-  if ($admin?.checklist?.branding) {
+  if ($admin?.cloud && $admin?.checklist?.branding) {
     let url = new URL(window.location.href)
     let hostname = url.hostname
     let parts = hostname.split(".")
-    let tenantId = parts[0]
+    let newTenantId = parts[0]
     let domain = parts.slice(-2).join(".")
-    CookieUtils.setCookie("tenantId", tenantId, domain)
+
+    let existingTenantId = CookieUtils.getCookie("tenantId")
+
+    if (!existingTenantId || existingTenantId !== newTenantId) {
+      CookieUtils.setCookie("tenantId", newTenantId, domain)
+    }
   }
 
   if (