diff --git a/packages/twenty-front/src/effect-components/PageChangeEffect.tsx b/packages/twenty-front/src/effect-components/PageChangeEffect.tsx
index 989d8377325..841e0b18ba5 100644
--- a/packages/twenty-front/src/effect-components/PageChangeEffect.tsx
+++ b/packages/twenty-front/src/effect-components/PageChangeEffect.tsx
@@ -88,7 +88,7 @@ export const PageChangeEffect = () => {
     ) {
       navigate(AppPath.PlanRequired);
     } else if (
-      onboardingStatus === OnboardingStatus.OngoingWorkspaceCreation &&
+      onboardingStatus === OnboardingStatus.OngoingWorkspaceActivation &&
       !isMatchingLocation(AppPath.CreateWorkspace)
     ) {
       navigate(AppPath.CreateWorkspace);
diff --git a/packages/twenty-front/src/modules/auth/hooks/__test__/useOnboardingStatus.test.ts b/packages/twenty-front/src/modules/auth/hooks/__test__/useOnboardingStatus.test.ts
index 7f8d8dae6cf..94f643840bc 100644
--- a/packages/twenty-front/src/modules/auth/hooks/__test__/useOnboardingStatus.test.ts
+++ b/packages/twenty-front/src/modules/auth/hooks/__test__/useOnboardingStatus.test.ts
@@ -129,27 +129,22 @@ describe('useOnboardingStatus', () => {
     );
   });
 
-  it('should return "ongoing_workspace_creation"', async () => {
+  it('should return "ongoing_workspace_activation"', async () => {
     const { result } = renderHooks();
-    const {
-      setTokenPair,
-      setBilling,
-      setCurrentWorkspace,
-      setCurrentWorkspaceMember,
-    } = result.current;
+    const { setTokenPair, setBilling, setCurrentWorkspace } = result.current;
 
     act(() => {
       setTokenPair(tokenPair);
       setBilling(billing);
       setCurrentWorkspace({
         ...currentWorkspace,
-        displayName: '',
         subscriptionStatus: 'active',
       });
-      setCurrentWorkspaceMember(currentWorkspaceMember);
     });
 
-    expect(result.current.onboardingStatus).toBe('ongoing_workspace_creation');
+    expect(result.current.onboardingStatus).toBe(
+      'ongoing_workspace_activation',
+    );
   });
 
   it('should return "ongoing_profile_creation"', async () => {
diff --git a/packages/twenty-front/src/modules/auth/utils/__test__/getOnboardingStatus.test.ts b/packages/twenty-front/src/modules/auth/utils/__test__/getOnboardingStatus.test.ts
index bf4a81dc158..2ca817cf587 100644
--- a/packages/twenty-front/src/modules/auth/utils/__test__/getOnboardingStatus.test.ts
+++ b/packages/twenty-front/src/modules/auth/utils/__test__/getOnboardingStatus.test.ts
@@ -20,18 +20,12 @@ describe('getOnboardingStatus', () => {
       } as CurrentWorkspace,
     });
 
-    const ongoingWorkspaceCreation = getOnboardingStatus({
+    const ongoingWorkspaceActivationPreviouslyActive = getOnboardingStatus({
       isLoggedIn: true,
-      currentWorkspaceMember: {
-        id: '1',
-        name: {
-          firstName: 'John',
-          lastName: 'Doe',
-        },
-      } as WorkspaceMember,
+      currentWorkspaceMember: null,
       currentWorkspace: {
         id: '1',
-        displayName: null,
+        displayName: 'My Workspace',
       } as CurrentWorkspace,
     });
 
@@ -114,7 +108,9 @@ describe('getOnboardingStatus', () => {
 
     expect(ongoingUserCreation).toBe('ongoing_user_creation');
     expect(ongoingWorkspaceActivation).toBe('ongoing_workspace_activation');
-    expect(ongoingWorkspaceCreation).toBe('ongoing_workspace_creation');
+    expect(ongoingWorkspaceActivationPreviouslyActive).toBe(
+      'ongoing_workspace_activation',
+    );
     expect(ongoingProfileCreation).toBe('ongoing_profile_creation');
     expect(completed).toBe('completed');
     expect(incomplete).toBe('incomplete');
diff --git a/packages/twenty-front/src/modules/auth/utils/getOnboardingStatus.ts b/packages/twenty-front/src/modules/auth/utils/getOnboardingStatus.ts
index 4e8f5902324..78d86a94b79 100644
--- a/packages/twenty-front/src/modules/auth/utils/getOnboardingStatus.ts
+++ b/packages/twenty-front/src/modules/auth/utils/getOnboardingStatus.ts
@@ -5,7 +5,6 @@ export enum OnboardingStatus {
   Incomplete = 'incomplete',
   Canceled = 'canceled',
   OngoingUserCreation = 'ongoing_user_creation',
-  OngoingWorkspaceCreation = 'ongoing_workspace_creation',
   OngoingWorkspaceActivation = 'ongoing_workspace_activation',
   OngoingProfileCreation = 'ongoing_profile_creation',
   Completed = 'completed',
@@ -44,10 +43,6 @@ export const getOnboardingStatus = ({
     return OnboardingStatus.OngoingWorkspaceActivation;
   }
 
-  if (!currentWorkspace?.displayName) {
-    return OnboardingStatus.OngoingWorkspaceCreation;
-  }
-
   if (
     !currentWorkspaceMember.name.firstName ||
     !currentWorkspaceMember.name.lastName
diff --git a/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx b/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx
index 23c9740d7c6..6515a08af2a 100644
--- a/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx
+++ b/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx
@@ -3,6 +3,7 @@ import { Meta, StoryObj } from '@storybook/react';
 import { expect, userEvent, within } from '@storybook/test';
 import { useSetRecoilState } from 'recoil';
 
+import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
 import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
 import { CommandType } from '@/command-menu/types/Command';
@@ -11,7 +12,10 @@ import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWith
 import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
 import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { mockDefaultWorkspace } from '~/testing/mock-data/users';
+import {
+  mockDefaultWorkspace,
+  mockedWorkspaceMemberData,
+} from '~/testing/mock-data/users';
 import { sleep } from '~/testing/sleep';
 
 import { CommandMenu } from '../CommandMenu';
@@ -24,10 +28,14 @@ const meta: Meta<typeof CommandMenu> = {
   decorators: [
     (Story) => {
       const setCurrentWorkspace = useSetRecoilState(currentWorkspaceState);
+      const setCurrentWorkspaceMember = useSetRecoilState(
+        currentWorkspaceMemberState,
+      );
       const { addToCommandMenu, setToIntitialCommandMenu, openCommandMenu } =
         useCommandMenu();
 
       setCurrentWorkspace(mockDefaultWorkspace);
+      setCurrentWorkspaceMember(mockedWorkspaceMemberData);
 
       useEffect(() => {
         setToIntitialCommandMenu();
diff --git a/packages/twenty-front/src/pages/auth/CreateWorkspace.tsx b/packages/twenty-front/src/pages/auth/CreateWorkspace.tsx
index b0d33d85b0f..8d82f3c56f7 100644
--- a/packages/twenty-front/src/pages/auth/CreateWorkspace.tsx
+++ b/packages/twenty-front/src/pages/auth/CreateWorkspace.tsx
@@ -114,7 +114,7 @@ export const CreateWorkspace = () => {
     [onSubmit],
   );
 
-  if (onboardingStatus !== OnboardingStatus.OngoingWorkspaceCreation) {
+  if (onboardingStatus !== OnboardingStatus.OngoingWorkspaceActivation) {
     return null;
   }