diff --git a/web/components/SsoButton.ce.vue b/web/components/SsoButton.ce.vue
index 0a5edf052..c5508964e 100644
--- a/web/components/SsoButton.ce.vue
+++ b/web/components/SsoButton.ce.vue
@@ -34,7 +34,6 @@ if (token) {
 }
 
 watch(queryParams, (newVal) => {
-  console.log('newVal', newVal);
   if (newVal?.token) {
     enterCallbackTokenIntoField(newVal.token);
     // Clear the token from the URL
@@ -49,7 +48,8 @@ const externalSSOUrl = computed(() => {
   }
   const url = new URL('sso', ACCOUNT);
   url.searchParams.append('uids', props.subids);
-  url.searchParams.append('callbackUrl', window.location.href);
+  const callbackUrlLogin = new URL('login', window.location.origin);
+  url.searchParams.append('serverUrl', callbackUrlLogin.toString());
   return url.toString();
 });
 </script>
diff --git a/web/pages/index.vue b/web/pages/index.vue
index 05ca38bfa..4bc0624b1 100644
--- a/web/pages/index.vue
+++ b/web/pages/index.vue
@@ -156,7 +156,7 @@ onMounted(() => {
           <div class="bg-background">
             <hr class="border-black dark:border-white" />
             <h2 class="text-xl font-semibold font-mono">SSO Button Component</h2>
-              <SsoButtonCe :server="serverState" />
+              <SsoButtonCe :subids="serverState.ssoSubIds" />
           </div>
         </div>
       </client-only>
diff --git a/web/pages/webComponents.vue b/web/pages/webComponents.vue
index 4ceaa3f99..8b15c614e 100644
--- a/web/pages/webComponents.vue
+++ b/web/pages/webComponents.vue
@@ -80,7 +80,7 @@ onBeforeMount(() => {
       <h3 class="text-lg font-semibold font-mono">
         SSOSignInButtonCe
       </h3>
-      <unraid-sso-button :server="JSON.stringify(serverState)" />
+      <unraid-sso-button :subids="serverState.ssoSubIds" />
     </unraid-i18n-host>
   </client-only>
 </template>