diff --git a/packages/twenty-front/src/modules/auth/components/Logo.tsx b/packages/twenty-front/src/modules/auth/components/Logo.tsx
index 4ade282f9..24b2acab5 100644
--- a/packages/twenty-front/src/modules/auth/components/Logo.tsx
+++ b/packages/twenty-front/src/modules/auth/components/Logo.tsx
@@ -5,7 +5,7 @@ import { Avatar } from 'twenty-ui/display';
 import { UndecoratedLink } from 'twenty-ui/navigation';
 import { REACT_APP_SERVER_BASE_URL } from '~/config';
 import { useRedirectToDefaultDomain } from '~/modules/domain-manager/hooks/useRedirectToDefaultDomain';
-import { AppPath } from '~/modules/types/AppPath';
+import { useReadDefaultDomainFromConfiguration } from '@/domain-manager/hooks/useReadDefaultDomainFromConfiguration';
 
 type LogoProps = {
   primaryLogo?: string | null;
@@ -59,6 +59,8 @@ export const Logo = ({
   const { redirectToDefaultDomain } = useRedirectToDefaultDomain();
   const defaultPrimaryLogoUrl = `${window.location.origin}/images/icons/android/android-launchericon-192-192.png`;
 
+  const { defaultUrl } = useReadDefaultDomainFromConfiguration();
+
   const primaryLogoUrl = getImageAbsoluteURI({
     imageUrl: primaryLogo ?? defaultPrimaryLogoUrl,
     baseUrl: REACT_APP_SERVER_BASE_URL,
@@ -77,7 +79,7 @@ export const Logo = ({
     <StyledContainer onClick={() => onClick?.()}>
       {isUsingDefaultLogo ? (
         <UndecoratedLink
-          to={AppPath.SignInUp}
+          to={defaultUrl.toString()}
           onClick={redirectToDefaultDomain}
         >
           <StyledPrimaryLogo src={primaryLogoUrl} />
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpGlobalScopeFormEffect.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpGlobalScopeFormEffect.tsx
index 1b6a6886a..0d1b27c4c 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpGlobalScopeFormEffect.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpGlobalScopeFormEffect.tsx
@@ -3,15 +3,18 @@ import {
   signInUpStepState,
 } from '@/auth/states/signInUpStepState';
 import { useEffect } from 'react';
-import { useSetRecoilState } from 'recoil';
+import { useRecoilValue, useSetRecoilState } from 'recoil';
 import { isDefined } from 'twenty-shared/utils';
 import { useAuth } from '@/auth/hooks/useAuth';
 import { useSearchParams } from 'react-router-dom';
+import { availableWorkspacesState } from '@/auth/states/availableWorkspacesState';
+import { countAvailableWorkspaces } from '@/auth/utils/availableWorkspacesUtils';
 
 export const SignInUpGlobalScopeFormEffect = () => {
   const setSignInUpStep = useSetRecoilState(signInUpStepState);
   const [searchParams, setSearchParams] = useSearchParams();
   const { setAuthTokens, loadCurrentUser } = useAuth();
+  const availableWorkspaces = useRecoilValue(availableWorkspacesState);
 
   useEffect(() => {
     const tokenPair = searchParams.get('tokenPair');
@@ -20,6 +23,9 @@ export const SignInUpGlobalScopeFormEffect = () => {
       searchParams.delete('tokenPair');
       setSearchParams(searchParams);
       loadCurrentUser();
+    }
+
+    if (countAvailableWorkspaces(availableWorkspaces) > 1) {
       setSignInUpStep(SignInUpStep.WorkspaceSelection);
     }
   }, [
@@ -28,6 +34,7 @@ export const SignInUpGlobalScopeFormEffect = () => {
     setSignInUpStep,
     loadCurrentUser,
     setAuthTokens,
+    availableWorkspaces,
   ]);
 
   return <></>;
diff --git a/packages/twenty-front/src/modules/domain-manager/hooks/useReadDefaultDomainFromConfiguration.ts b/packages/twenty-front/src/modules/domain-manager/hooks/useReadDefaultDomainFromConfiguration.ts
index 7b46360c1..b728c44b7 100644
--- a/packages/twenty-front/src/modules/domain-manager/hooks/useReadDefaultDomainFromConfiguration.ts
+++ b/packages/twenty-front/src/modules/domain-manager/hooks/useReadDefaultDomainFromConfiguration.ts
@@ -10,7 +10,11 @@ export const useReadDefaultDomainFromConfiguration = () => {
     ? `${domainConfiguration.defaultSubdomain}.${domainConfiguration.frontDomain}`
     : domainConfiguration.frontDomain;
 
+  const defaultUrl = new URL(window.location.href);
+  defaultUrl.hostname = defaultDomain;
+
   return {
     defaultDomain,
+    defaultUrl,
   };
 };
diff --git a/packages/twenty-front/src/pages/auth/SignInUp.tsx b/packages/twenty-front/src/pages/auth/SignInUp.tsx
index 0b9bb651d..f4bfe6930 100644
--- a/packages/twenty-front/src/pages/auth/SignInUp.tsx
+++ b/packages/twenty-front/src/pages/auth/SignInUp.tsx
@@ -1,11 +1,8 @@
 import { useSignInUp } from '@/auth/sign-in-up/hooks/useSignInUp';
 import { useSignInUpForm } from '@/auth/sign-in-up/hooks/useSignInUpForm';
-import {
-  SignInUpStep,
-  signInUpStepState,
-} from '@/auth/states/signInUpStepState';
+import { SignInUpStep } from '@/auth/states/signInUpStepState';
 import { workspacePublicDataState } from '@/auth/states/workspacePublicDataState';
-import { useRecoilValue, useSetRecoilState } from 'recoil';
+import { useRecoilValue } from 'recoil';
 
 import { Logo } from '@/auth/components/Logo';
 import { Title } from '@/auth/components/Title';
@@ -30,6 +27,7 @@ import { isDefined } from 'twenty-shared/utils';
 import { AnimatedEaseIn } from 'twenty-ui/utilities';
 import { PublicWorkspaceDataOutput } from '~/generated/graphql';
 import { SignInUpGlobalScopeFormEffect } from '@/auth/sign-in-up/components/internal/SignInUpGlobalScopeFormEffect';
+import { useAuth } from '@/auth/hooks/useAuth';
 
 const StandardContent = ({
   workspacePublicData,
@@ -62,7 +60,6 @@ const StandardContent = ({
 
 export const SignInUp = () => {
   const { t } = useLingui();
-  const setSignInUpStep = useSetRecoilState(signInUpStepState);
 
   const { form } = useSignInUpForm();
   const { signInUpStep } = useSignInUp(form);
@@ -73,11 +70,14 @@ export const SignInUp = () => {
   const isMultiWorkspaceEnabled = useRecoilValue(isMultiWorkspaceEnabledState);
   const { workspaceInviteHash, workspace: workspaceFromInviteHash } =
     useWorkspaceFromInviteHash();
+  const { signOut } = useAuth();
 
   const [searchParams] = useSearchParams();
 
   const onClickOnLogo = () => {
-    setSignInUpStep(SignInUpStep.Init);
+    if (!isOnAWorkspace && signInUpStep === SignInUpStep.WorkspaceSelection) {
+      signOut();
+    }
   };
 
   const title = useMemo(() => {
diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
index 3733e938a..8e986ec05 100644
--- a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
@@ -406,23 +406,24 @@ export class UserWorkspaceService extends TypeOrmQueryService<UserWorkspace> {
       displayName: workspace.displayName,
       workspaceUrls: this.domainManagerService.getWorkspaceUrls(workspace),
       logo: workspace.logo,
-      sso: workspace.workspaceSSOIdentityProviders.reduce(
-        (acc, identityProvider) =>
-          acc.concat(
-            identityProvider.status === 'Inactive'
-              ? []
-              : [
-                  {
-                    id: identityProvider.id,
-                    name: identityProvider.name,
-                    issuer: identityProvider.issuer,
-                    type: identityProvider.type,
-                    status: identityProvider.status,
-                  },
-                ],
-          ),
-        [] as AvailableWorkspace['sso'],
-      ),
+      sso:
+        workspace.workspaceSSOIdentityProviders?.reduce(
+          (acc, identityProvider) =>
+            acc.concat(
+              identityProvider.status === 'Inactive'
+                ? []
+                : [
+                    {
+                      id: identityProvider.id,
+                      name: identityProvider.name,
+                      issuer: identityProvider.issuer,
+                      type: identityProvider.type,
+                      status: identityProvider.status,
+                    },
+                  ],
+            ),
+          [] as AvailableWorkspace['sso'],
+        ) ?? [],
     };
   }
 
@@ -446,7 +447,12 @@ export class UserWorkspaceService extends TypeOrmQueryService<UserWorkspace> {
           ({ workspace, appToken }) => {
             return {
               ...this.castWorkspaceToAvailableWorkspace(workspace),
-              ...(appToken ? { personalInviteToken: appToken.value } : {}),
+              ...(appToken
+                ? {
+                    personalInviteToken: appToken.value,
+                    inviteHash: workspace.inviteHash,
+                  }
+                : {}),
             };
           },
         ),