diff --git a/packages/account-portal b/packages/account-portal
index aaf64dd002..50864c77a7 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit aaf64dd002a7d2b9ff37f989e03d444c9b9f2b36
+Subproject commit 50864c77a7c82e7b3f0d1dcfe6ac29d4a0173726
diff --git a/packages/builder/src/pages/builder/auth/_layout.svelte b/packages/builder/src/pages/builder/auth/_layout.svelte
index d1bf623e1a..d66b1bebbf 100644
--- a/packages/builder/src/pages/builder/auth/_layout.svelte
+++ b/packages/builder/src/pages/builder/auth/_layout.svelte
@@ -1,6 +1,7 @@
 <script>
   import { auth, admin } from "stores/portal"
   import { redirect } from "@roxi/routify"
+  import { CookieUtils } from "@budibase/frontend-core"
 
   // If already authenticated, redirect away from the auth section.
   // Check this onMount rather than a reactive statement to avoid trumping
@@ -9,13 +10,20 @@
     $redirect("../")
   }
 
+  if ($admin.checklist?.branding) {
+    let url = new URL("http://hello.petertest.com:10001/auth/login")
+    let hostname = url.hostname
+    let parts = hostname.split(".")
+    let tenantId = parts[0]
+    CookieUtils.setCookie("tenantId", tenantId, "petertest.com")
+  }
+
   if (
     !$auth.user &&
     $admin.cloud &&
     !$admin.disableAccountPortal &&
     $admin.accountPortalUrl &&
-    !$admin?.checklist?.sso?.checked &&
-    !$admin.checklist.branding
+    !$admin?.checklist?.sso?.checked
   ) {
     window.location.href = $admin.accountPortalUrl
   }
diff --git a/packages/frontend-core/src/utils/cookies.js b/packages/frontend-core/src/utils/cookies.js
index 5ecaa3424f..35d6807a68 100644
--- a/packages/frontend-core/src/utils/cookies.js
+++ b/packages/frontend-core/src/utils/cookies.js
@@ -1,8 +1,12 @@
-export function setCookie(name, value) {
+export function setCookie(name, value, domain) {
   if (getCookie(name)) {
     removeCookie(name)
   }
-  window.document.cookie = `${name}=${value}; Path=/;`
+  let cookieString = `${name}=${value}; Path=/;`
+  if (domain) {
+    cookieString += ` Domain=${domain};`
+  }
+  window.document.cookie = cookieString
 }
 
 export function getCookie(cookieName) {