diff --git a/src/components/App/index.tsx b/src/components/App/index.tsx
index 117082abc..bf355b12b 100644
--- a/src/components/App/index.tsx
+++ b/src/components/App/index.tsx
@@ -15,7 +15,6 @@ import { useAppStore } from '~/stores/useAppStore'
 import { useDataStore } from '~/stores/useDataStore'
 import { useFeatureFlagStore } from '~/stores/useFeatureFlagStore'
 import { useUpdateSelectedNode } from '~/stores/useGraphStore'
-import { useModal } from '~/stores/useModalStore'
 import { useTeachStore } from '~/stores/useTeachStore'
 import { useUserStore } from '~/stores/useUserStore'
 import {
@@ -54,18 +53,12 @@ const LazyMainToolbar = lazy(() => import('./MainToolbar').then(({ MainToolbar }
 const LazyUniverse = lazy(() => import('~/components/Universe').then(({ Universe }) => ({ default: Universe })))
 const LazySideBar = lazy(() => import('./SideBar').then(({ SideBar }) => ({ default: SideBar })))
 
-const LazyOnboardingModal = lazy(() =>
-  import('../ModalsContainer/OnboardingFlow').then(({ OnboardingModal }) => ({ default: OnboardingModal })),
-)
-
 export const App = () => {
   const [searchParams] = useSearchParams()
   const query = searchParams.get('q')
   const { setBudget, setNodeCount } = useUserStore((s) => s)
   const queueRef = useRef<FetchDataResponse | null>(null)
   const timerRef = useRef<NodeJS.Timeout | null>(null)
-  const { open, visible } = useModal('onboardingFlow')
-  const [isAdmin] = useUserStore((s) => [s.isAdmin, s.setPubKey])
 
   const {
     setSidebarOpen,
@@ -75,7 +68,6 @@ export const App = () => {
     setTranscriptOpen,
     universeQuestionIsOpen,
     setUniverseQuestionIsOpen,
-    appMetaData,
   } = useAppStore((s) => s)
 
   const setTeachMeAnswer = useTeachStore((s) => s.setTeachMeAnswer)
@@ -330,16 +322,10 @@ export const App = () => {
   }, [runningProjectId, setRunningProjectMessages])
 
   useEffect(() => {
-    if (!isAdmin && appMetaData?.title && !visible) {
-      open()
-    }
-  }, [isAdmin, appMetaData?.title, open, visible])
-
-  useEffect(() => {
-    if (!splashDataLoading && !visible) {
+    if (!splashDataLoading) {
       setUniverseQuestionIsOpen()
     }
-  }, [setUniverseQuestionIsOpen, splashDataLoading, visible])
+  }, [setUniverseQuestionIsOpen, splashDataLoading])
 
   return (
     <>
@@ -350,13 +336,7 @@ export const App = () => {
       <Leva hidden={!isDevelopment || true} isRoot />
 
       <Suspense fallback={<div>Loading...</div>}>
-        {visible && (
-          <Suspense fallback={<div>Loading Onboarding...</div>}>
-            <LazyOnboardingModal onSuccess={setUniverseQuestionIsOpen} />
-          </Suspense>
-        )}
-
-        {!visible && !splashDataLoading && (
+        {!splashDataLoading ? (
           <Wrapper direction="row">
             <FormProvider {...form}>
               <LazyMainToolbar />
@@ -371,7 +351,7 @@ export const App = () => {
             <ModalsContainer />
             <Toasts />
           </Wrapper>
-        )}
+        ) : null}
       </Suspense>
     </>
   )
diff --git a/src/components/Auth/__tests__/index.tsx b/src/components/Auth/__tests__/index.tsx
index cf0076ef1..402f3da88 100644
--- a/src/components/Auth/__tests__/index.tsx
+++ b/src/components/Auth/__tests__/index.tsx
@@ -1,335 +1,366 @@
-import { ThemeProvider } from '@mui/material'
-import '@testing-library/jest-dom'
-import { cleanup, render, screen, waitFor } from '@testing-library/react'
-import { setupJestCanvasMock } from 'jest-canvas-mock'
-import React from 'react'
-import { MemoryRouter } from 'react-router-dom'
-import * as sphinx from 'sphinx-bridge'
-import { ThemeProvider as StyleThemeProvider } from 'styled-components'
-import * as network from '../../../network/auth'
-import { useDataStore } from '../../../stores/useDataStore'
-import { useUserStore } from '../../../stores/useUserStore'
-import * as utils from '../../../utils/getSignedMessage'
-import { App } from '../../App'
-import { appTheme } from '../../App/Providers'
-import { AuthGuard } from '../index'
-
-jest.mock('sphinx-bridge')
-jest.mock('~/stores/useUserStore')
-jest.mock('~/stores/useDataStore')
-jest.mock('~/utils/versionHelper', () => null)
-jest.mock('react-toastify/dist/ReactToastify.css', () => null)
-jest.mock('~/components/App/Splash/SpiningSphere', () => jest.fn(() => <div data-testid="spinning sphere" />))
-
-jest.mock('~/components/Universe', () => ({
-  Universe: () => <div>Mocked Universe Component</div>,
-}))
-
-Object.defineProperty(navigator, 'userAgent', {
-  value: 'Sphinx',
-  configurable: true,
-})
-
-const useDataStoreMock = useDataStore as jest.MockedFunction<typeof useDataStore>
-const useUserStoreMock = useUserStore as jest.MockedFunction<typeof useUserStore>
-const getSignedMessageFromRelayMock = jest.spyOn(utils, 'getSignedMessageFromRelay')
-const getIsAdminMock = jest.spyOn(network, 'getIsAdmin')
-
-const message = 'This is a private Graph, Contact Admin'
-
-describe('Auth Component', () => {
-  afterEach(cleanup)
-
-  beforeAll(() => {
-    jest.clearAllMocks()
-    localStorage.clear()
-    sessionStorage.clear()
-  })
-
-  beforeEach(() => {
-    localStorage.clear()
-    jest.resetAllMocks()
-    setupJestCanvasMock(window)
-
-    useDataStoreMock.mockReturnValue({
-      fetchData: jest.fn(),
-      setCategoryFilter: jest.fn(),
-      setAbortRequests: jest.fn(),
-      addNewNode: jest.fn(),
-      splashDataLoading: false,
-    })
-
-    Object.defineProperty(window, 'matchMedia', {
-      writable: true,
-      value: jest.fn().mockImplementation(() => ({
-        matches: false,
-        removeEventListener: jest.fn(),
-      })),
-    })
-  })
-
-  test('should set authenticated state to true upon successful authentication', async () => {
-    const [setBudget, setIsAdmin, setPubKey, setIsAuthenticated] = [jest.fn(), jest.fn(), jest.fn(), jest.fn()]
-
-    useUserStoreMock.mockReturnValue({
-      setBudget,
-      setIsAdmin,
-      setPubKey,
-      setIsAuthenticated,
-    })
-
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    sphinx.enable.mockResolvedValue()
-    getIsAdminMock.mockResolvedValue({ data: { isAdmin: false, isPublic: true } })
-    getSignedMessageFromRelayMock.mockResolvedValue({ message: 'testMessage', signature: 'testSignature' })
-
-    render(
-      <MemoryRouter>
-        <ThemeProvider theme={appTheme}>
-          <StyleThemeProvider theme={appTheme}>
-            <AuthGuard>
-              <App />
-            </AuthGuard>
-          </StyleThemeProvider>
-        </ThemeProvider>
-      </MemoryRouter>,
-    )
-
-    await waitFor(() => expect(setIsAuthenticated).toHaveBeenCalledWith(true))
-  }, 50000)
-
-  test('should update appropriate state and local storage if user is an admin', async () => {
-    const [setBudget, setIsAdmin, setPubKey, setIsAuthenticated] = [jest.fn(), jest.fn(), jest.fn(), jest.fn()]
-
-    useUserStoreMock.mockReturnValue({
-      isAdmin: true,
-      setBudget,
-      setIsAdmin,
-      setPubKey,
-      setIsAuthenticated,
-    })
-
-    getIsAdminMock.mockResolvedValue({ data: { isAdmin: true } })
-    getSignedMessageFromRelayMock.mockResolvedValue({ message: 'testMessage', signature: 'testSignature' })
-
-    render(
-      <MemoryRouter>
-        <ThemeProvider theme={appTheme}>
-          <StyleThemeProvider theme={appTheme}>
-            <AuthGuard>
-              <App />
-            </AuthGuard>
-          </StyleThemeProvider>
-        </ThemeProvider>
-      </MemoryRouter>,
-    )
-
-    await waitFor(() => expect(setIsAdmin).toHaveBeenCalledWith(true))
-    await waitFor(() => expect(localStorage.getItem('admin')).not.toBeNull())
-  })
-
-  test('should render the unauthorized access message if user is not authorized', async () => {
-    const [setBudget, setIsAdmin, setPubKey, setIsAuthenticated] = [jest.fn(), jest.fn(), jest.fn(), jest.fn()]
-
-    useUserStoreMock.mockReturnValue({
-      setBudget,
-      setIsAdmin,
-      setPubKey,
-      setIsAuthenticated,
-    })
-
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    sphinx.enable.mockResolvedValue({ pubkey: 'testPubkey' })
-
-    getIsAdminMock.mockRejectedValue({
-      response: {
-        status: 401,
-        data: {
-          status: 'error',
-          message: 'Permission denied',
-        },
-      },
-    })
-
-    getSignedMessageFromRelayMock.mockResolvedValue({ message: 'testMessage', signature: 'testSignature' })
-
-    render(
-      <MemoryRouter>
-        <ThemeProvider theme={appTheme}>
-          <StyleThemeProvider theme={appTheme}>
-            <AuthGuard>
-              <App />
-            </AuthGuard>
-          </StyleThemeProvider>
-        </ThemeProvider>
-      </MemoryRouter>,
-    )
-
-    await waitFor(() => {
-      expect(getIsAdminMock).toHaveBeenCalled()
-    })
-
-    await waitFor(() => {
-      expect(screen.getByText(message)).toBeInTheDocument()
-    })
-  })
-
-  test.skip('the unauthorized state is correctly set when the user lacks proper credentials', async () => {
-    const [setBudget, setIsAdmin, setPubKey, setIsAuthenticated] = [jest.fn(), jest.fn(), jest.fn(), jest.fn()]
-
-    useUserStoreMock.mockReturnValue({
-      setBudget,
-      setIsAdmin,
-      setPubKey,
-      setIsAuthenticated,
-    })
-
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    sphinx.enable.mockResolvedValue({ pubkey: 'testPubKey' })
-    getIsAdminMock.mockResolvedValue({ data: { isAdmin: false, isPublic: true, isMember: false } })
-    getSignedMessageFromRelayMock.mockResolvedValue({ message: 'testMessage', signature: '' })
-
-    render(
-      <MemoryRouter>
-        <ThemeProvider theme={appTheme}>
-          <StyleThemeProvider theme={appTheme}>
-            <AuthGuard>
-              <App />
-            </AuthGuard>
-          </StyleThemeProvider>
-        </ThemeProvider>
-      </MemoryRouter>,
-    )
-
-    await waitFor(() => expect(setIsAuthenticated).toHaveBeenCalledWith(true))
-  })
-
-  test('test unsuccessful attempts to enable Sphinx', async () => {
-    const [setBudget, setIsAdmin, setPubKey, setIsAuthenticated] = [jest.fn(), jest.fn(), jest.fn(), jest.fn()]
-
-    useUserStoreMock.mockReturnValue({
-      setBudget,
-      setIsAdmin,
-      setPubKey,
-      setIsAuthenticated,
-    })
-
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    sphinx.enable.mockResolvedValue(null)
-    getIsAdminMock.mockResolvedValue({ data: { isAdmin: false, isPublic: true, isMember: false } })
-    getSignedMessageFromRelayMock.mockResolvedValue({ message: 'testMessage', signature: '' })
-
-    render(
-      <MemoryRouter>
-        <ThemeProvider theme={appTheme}>
-          <StyleThemeProvider theme={appTheme}>
-            <AuthGuard>
-              <App />
-            </AuthGuard>
-          </StyleThemeProvider>
-        </ThemeProvider>
-      </MemoryRouter>,
-    )
-
-    await waitFor(() => expect(setPubKey).toHaveBeenCalledWith(undefined))
-    await waitFor(() => expect(setIsAuthenticated).toHaveBeenCalledWith(true))
-  })
-
-  test('test the public key is set correctly on successful Sphinx enablement', async () => {
-    const [setBudget, setIsAdmin, setPubKey, setIsAuthenticated] = [jest.fn(), jest.fn(), jest.fn(), jest.fn()]
-
-    useUserStoreMock.mockReturnValue({
-      setBudget,
-      setIsAdmin,
-      setPubKey,
-      setIsAuthenticated,
-    })
-
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    sphinx.enable.mockResolvedValue({ pubkey: 'testPubkey' })
-    getIsAdminMock.mockResolvedValue({ data: { isAdmin: false, isPublic: true, isMember: false } })
-    getSignedMessageFromRelayMock.mockResolvedValue({ message: 'testMessage', signature: '' })
-
-    render(
-      <MemoryRouter>
-        <ThemeProvider theme={appTheme}>
-          <StyleThemeProvider theme={appTheme}>
-            <AuthGuard>
-              <App />
-            </AuthGuard>
-          </StyleThemeProvider>
-        </ThemeProvider>
-      </MemoryRouter>,
-    )
-
-    await waitFor(() => expect(setPubKey).toHaveBeenCalledWith('testPubkey'))
-  })
-
-  test('test the public key state is handled correctly on Sphinx enablement failure', async () => {
-    const [setBudget, setIsAdmin, setPubKey, setIsAuthenticated] = [jest.fn(), jest.fn(), jest.fn(), jest.fn()]
-
-    useUserStoreMock.mockReturnValue({
-      setBudget,
-      setIsAdmin,
-      setPubKey,
-      setIsAuthenticated,
-    })
-
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    sphinx.enable.mockRejectedValue()
-    getIsAdminMock.mockResolvedValue({ data: { isAdmin: false, isPublic: true, isMember: false } })
-    getSignedMessageFromRelayMock.mockResolvedValue({ message: 'testMessage', signature: '' })
-
-    render(
-      <MemoryRouter>
-        <ThemeProvider theme={appTheme}>
-          <StyleThemeProvider theme={appTheme}>
-            <AuthGuard>
-              <App />
-            </AuthGuard>
-          </StyleThemeProvider>
-        </ThemeProvider>
-      </MemoryRouter>,
-    )
-
-    await waitFor(() => expect(setPubKey).toHaveBeenCalledWith(''))
-  })
-
-  test('simulate errors during the authentication process and verify that they are handled gracefully.', async () => {
-    const [setBudget, setIsAdmin, setPubKey, setIsAuthenticated] = [jest.fn(), jest.fn(), jest.fn(), jest.fn()]
-
-    useUserStoreMock.mockReturnValue({
-      setBudget,
-      setIsAdmin,
-      setPubKey,
-      setIsAuthenticated,
-    })
-
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    sphinx.enable.mockRejectedValue()
-    getIsAdminMock.mockResolvedValue({ data: { isAdmin: false, isPublic: true, isMember: false } })
-    getSignedMessageFromRelayMock.mockRejectedValue(null)
-
-    render(
-      <MemoryRouter>
-        <ThemeProvider theme={appTheme}>
-          <StyleThemeProvider theme={appTheme}>
-            <AuthGuard>
-              <App />
-            </AuthGuard>
-          </StyleThemeProvider>
-        </ThemeProvider>
-      </MemoryRouter>,
-    )
-
-    await waitFor(() => expect(setPubKey).toHaveBeenCalledWith(''))
-    await waitFor(() => expect(setIsAuthenticated).toHaveBeenCalledWith(true))
-  })
-})
+import { ThemeProvider } from '@mui/material'
+import '@testing-library/jest-dom'
+import { cleanup, render, screen, waitFor } from '@testing-library/react'
+import { setupJestCanvasMock } from 'jest-canvas-mock'
+import React from 'react'
+import { MemoryRouter } from 'react-router-dom'
+import * as sphinx from 'sphinx-bridge'
+import { ThemeProvider as StyleThemeProvider } from 'styled-components'
+import * as network from '../../../network/auth'
+import { useDataStore } from '../../../stores/useDataStore'
+import { useUserStore } from '../../../stores/useUserStore'
+import * as utils from '../../../utils/getSignedMessage'
+import { App } from '../../App'
+import { appTheme } from '../../App/Providers'
+import { AuthGuard } from '../index'
+
+jest.mock('sphinx-bridge')
+jest.mock('~/stores/useUserStore')
+jest.mock('~/stores/useDataStore')
+jest.mock('~/utils/versionHelper', () => null)
+jest.mock('react-toastify/dist/ReactToastify.css', () => null)
+jest.mock('~/components/App/Splash/SpiningSphere', () => jest.fn(() => <div data-testid="spinning sphere" />))
+
+jest.mock('~/components/Universe', () => ({
+  Universe: () => <div>Mocked Universe Component</div>,
+}))
+
+Object.defineProperty(navigator, 'userAgent', {
+  value: 'Sphinx',
+  configurable: true,
+})
+
+const useDataStoreMock = useDataStore as jest.MockedFunction<typeof useDataStore>
+const useUserStoreMock = useUserStore as jest.MockedFunction<typeof useUserStore>
+const getSignedMessageFromRelayMock = jest.spyOn(utils, 'getSignedMessageFromRelay')
+const getIsAdminMock = jest.spyOn(network, 'getIsAdmin')
+
+const message = 'This is a private Graph, Contact Admin'
+
+describe('Auth Component', () => {
+  afterEach(cleanup)
+
+  beforeAll(() => {
+    jest.clearAllMocks()
+    localStorage.clear()
+    sessionStorage.clear()
+  })
+
+  beforeEach(() => {
+    localStorage.clear()
+    jest.resetAllMocks()
+    setupJestCanvasMock(window)
+
+    useDataStoreMock.mockReturnValue({
+      fetchData: jest.fn(),
+      setCategoryFilter: jest.fn(),
+      setAbortRequests: jest.fn(),
+      addNewNode: jest.fn(),
+      splashDataLoading: false,
+    })
+
+    Object.defineProperty(window, 'matchMedia', {
+      writable: true,
+      value: jest.fn().mockImplementation(() => ({
+        matches: false,
+        removeEventListener: jest.fn(),
+      })),
+    })
+  })
+
+  test('should set authenticated state to true upon successful authentication', async () => {
+    const [setBudget, setIsAdmin, setPubKey, setIsAuthenticated] = [jest.fn(), jest.fn(), jest.fn(), jest.fn()]
+
+    useUserStoreMock.mockReturnValue({
+      setBudget,
+      setIsAdmin,
+      setPubKey,
+      setIsAuthenticated,
+    })
+
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    sphinx.enable.mockResolvedValue()
+    getIsAdminMock.mockResolvedValue({ data: { isAdmin: false, isPublic: true } })
+    getSignedMessageFromRelayMock.mockResolvedValue({ message: 'testMessage', signature: 'testSignature' })
+
+    render(
+      <MemoryRouter>
+        <ThemeProvider theme={appTheme}>
+          <StyleThemeProvider theme={appTheme}>
+            <AuthGuard>
+              <App />
+            </AuthGuard>
+          </StyleThemeProvider>
+        </ThemeProvider>
+      </MemoryRouter>,
+    )
+
+    await waitFor(() => expect(setIsAuthenticated).toHaveBeenCalledWith(true))
+  }, 50000)
+
+  test('should update appropriate state and local storage if user is an admin', async () => {
+    const [setBudget, setIsAdmin, setPubKey, setIsAuthenticated] = [jest.fn(), jest.fn(), jest.fn(), jest.fn()]
+
+    useUserStoreMock.mockReturnValue({
+      isAdmin: true,
+      setBudget,
+      setIsAdmin,
+      setPubKey,
+      setIsAuthenticated,
+    })
+
+    getIsAdminMock.mockResolvedValue({ data: { isAdmin: true } })
+    getSignedMessageFromRelayMock.mockResolvedValue({ message: 'testMessage', signature: 'testSignature' })
+
+    render(
+      <MemoryRouter>
+        <ThemeProvider theme={appTheme}>
+          <StyleThemeProvider theme={appTheme}>
+            <AuthGuard>
+              <App />
+            </AuthGuard>
+          </StyleThemeProvider>
+        </ThemeProvider>
+      </MemoryRouter>,
+    )
+
+    await waitFor(() => expect(setIsAdmin).toHaveBeenCalledWith(true))
+    await waitFor(() => expect(localStorage.getItem('admin')).not.toBeNull())
+  })
+
+  test('should render the unauthorized access message if user is not authorized', async () => {
+    const [setBudget, setIsAdmin, setPubKey, setIsAuthenticated] = [jest.fn(), jest.fn(), jest.fn(), jest.fn()]
+
+    useUserStoreMock.mockReturnValue({
+      setBudget,
+      setIsAdmin,
+      setPubKey,
+      setIsAuthenticated,
+    })
+
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    sphinx.enable.mockResolvedValue({ pubkey: 'testPubkey' })
+
+    getIsAdminMock.mockRejectedValue({
+      response: {
+        status: 401,
+        data: {
+          status: 'error',
+          message: 'Permission denied',
+        },
+      },
+    })
+
+    getSignedMessageFromRelayMock.mockResolvedValue({ message: 'testMessage', signature: 'testSignature' })
+
+    render(
+      <MemoryRouter>
+        <ThemeProvider theme={appTheme}>
+          <StyleThemeProvider theme={appTheme}>
+            <AuthGuard>
+              <App />
+            </AuthGuard>
+          </StyleThemeProvider>
+        </ThemeProvider>
+      </MemoryRouter>,
+    )
+
+    await waitFor(() => {
+      expect(getIsAdminMock).toHaveBeenCalled()
+    })
+
+    await waitFor(() => {
+      expect(screen.getByText(message)).toBeInTheDocument()
+    })
+  })
+
+  test('should show onboarding modal if admin and no title is set', async () => {
+    const [setBudget, setIsAdmin, setPubKey, setIsAuthenticated] = [jest.fn(), jest.fn(), jest.fn(), jest.fn()]
+
+    useUserStoreMock.mockReturnValue({
+      isAdmin: true,
+      setBudget,
+      setIsAdmin,
+      setPubKey,
+      setIsAuthenticated,
+    })
+
+    getIsAdminMock.mockResolvedValue({ data: { isAdmin: true, title: null } })
+    getSignedMessageFromRelayMock.mockResolvedValue({ message: 'testMessage', signature: 'testSignature' })
+
+    render(
+      <MemoryRouter>
+        <ThemeProvider theme={appTheme}>
+          <StyleThemeProvider theme={appTheme}>
+            <AuthGuard>
+              <App />
+            </AuthGuard>
+          </StyleThemeProvider>
+        </ThemeProvider>
+      </MemoryRouter>,
+    )
+
+    waitFor(() => {
+      expect(screen.getByText('Welcome to SecondBrain')).toBeInTheDocument()
+    })
+  })
+
+  test.skip('the unauthorized state is correctly set when the user lacks proper credentials', async () => {
+    const [setBudget, setIsAdmin, setPubKey, setIsAuthenticated] = [jest.fn(), jest.fn(), jest.fn(), jest.fn()]
+
+    useUserStoreMock.mockReturnValue({
+      setBudget,
+      setIsAdmin,
+      setPubKey,
+      setIsAuthenticated,
+    })
+
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    sphinx.enable.mockResolvedValue({ pubkey: 'testPubKey' })
+    getIsAdminMock.mockResolvedValue({ data: { isAdmin: false, isPublic: true, isMember: false } })
+    getSignedMessageFromRelayMock.mockResolvedValue({ message: 'testMessage', signature: '' })
+
+    render(
+      <MemoryRouter>
+        <ThemeProvider theme={appTheme}>
+          <StyleThemeProvider theme={appTheme}>
+            <AuthGuard>
+              <App />
+            </AuthGuard>
+          </StyleThemeProvider>
+        </ThemeProvider>
+      </MemoryRouter>,
+    )
+
+    await waitFor(() => expect(setIsAuthenticated).toHaveBeenCalledWith(true))
+  })
+
+  test('test unsuccessful attempts to enable Sphinx', async () => {
+    const [setBudget, setIsAdmin, setPubKey, setIsAuthenticated] = [jest.fn(), jest.fn(), jest.fn(), jest.fn()]
+
+    useUserStoreMock.mockReturnValue({
+      setBudget,
+      setIsAdmin,
+      setPubKey,
+      setIsAuthenticated,
+    })
+
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    sphinx.enable.mockResolvedValue(null)
+    getIsAdminMock.mockResolvedValue({ data: { isAdmin: false, isPublic: true, isMember: false } })
+    getSignedMessageFromRelayMock.mockResolvedValue({ message: 'testMessage', signature: '' })
+
+    render(
+      <MemoryRouter>
+        <ThemeProvider theme={appTheme}>
+          <StyleThemeProvider theme={appTheme}>
+            <AuthGuard>
+              <App />
+            </AuthGuard>
+          </StyleThemeProvider>
+        </ThemeProvider>
+      </MemoryRouter>,
+    )
+
+    await waitFor(() => expect(setPubKey).toHaveBeenCalledWith(undefined))
+    await waitFor(() => expect(setIsAuthenticated).toHaveBeenCalledWith(true))
+  })
+
+  test('test the public key is set correctly on successful Sphinx enablement', async () => {
+    const [setBudget, setIsAdmin, setPubKey, setIsAuthenticated] = [jest.fn(), jest.fn(), jest.fn(), jest.fn()]
+
+    useUserStoreMock.mockReturnValue({
+      setBudget,
+      setIsAdmin,
+      setPubKey,
+      setIsAuthenticated,
+    })
+
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    sphinx.enable.mockResolvedValue({ pubkey: 'testPubkey' })
+    getIsAdminMock.mockResolvedValue({ data: { isAdmin: false, isPublic: true, isMember: false } })
+    getSignedMessageFromRelayMock.mockResolvedValue({ message: 'testMessage', signature: '' })
+
+    render(
+      <MemoryRouter>
+        <ThemeProvider theme={appTheme}>
+          <StyleThemeProvider theme={appTheme}>
+            <AuthGuard>
+              <App />
+            </AuthGuard>
+          </StyleThemeProvider>
+        </ThemeProvider>
+      </MemoryRouter>,
+    )
+
+    await waitFor(() => expect(setPubKey).toHaveBeenCalledWith('testPubkey'))
+  })
+
+  test('test the public key state is handled correctly on Sphinx enablement failure', async () => {
+    const [setBudget, setIsAdmin, setPubKey, setIsAuthenticated] = [jest.fn(), jest.fn(), jest.fn(), jest.fn()]
+
+    useUserStoreMock.mockReturnValue({
+      setBudget,
+      setIsAdmin,
+      setPubKey,
+      setIsAuthenticated,
+    })
+
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    sphinx.enable.mockRejectedValue()
+    getIsAdminMock.mockResolvedValue({ data: { isAdmin: false, isPublic: true, isMember: false } })
+    getSignedMessageFromRelayMock.mockResolvedValue({ message: 'testMessage', signature: '' })
+
+    render(
+      <MemoryRouter>
+        <ThemeProvider theme={appTheme}>
+          <StyleThemeProvider theme={appTheme}>
+            <AuthGuard>
+              <App />
+            </AuthGuard>
+          </StyleThemeProvider>
+        </ThemeProvider>
+      </MemoryRouter>,
+    )
+
+    await waitFor(() => expect(setPubKey).toHaveBeenCalledWith(''))
+  })
+
+  test('simulate errors during the authentication process and verify that they are handled gracefully.', async () => {
+    const [setBudget, setIsAdmin, setPubKey, setIsAuthenticated] = [jest.fn(), jest.fn(), jest.fn(), jest.fn()]
+
+    useUserStoreMock.mockReturnValue({
+      setBudget,
+      setIsAdmin,
+      setPubKey,
+      setIsAuthenticated,
+    })
+
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    sphinx.enable.mockRejectedValue()
+    getIsAdminMock.mockResolvedValue({ data: { isAdmin: false, isPublic: true, isMember: false } })
+    getSignedMessageFromRelayMock.mockRejectedValue(null)
+
+    render(
+      <MemoryRouter>
+        <ThemeProvider theme={appTheme}>
+          <StyleThemeProvider theme={appTheme}>
+            <AuthGuard>
+              <App />
+            </AuthGuard>
+          </StyleThemeProvider>
+        </ThemeProvider>
+      </MemoryRouter>,
+    )
+
+    await waitFor(() => expect(setPubKey).toHaveBeenCalledWith(''))
+    await waitFor(() => expect(setIsAuthenticated).toHaveBeenCalledWith(true))
+  })
+})
diff --git a/src/components/Auth/index.tsx b/src/components/Auth/index.tsx
index 540514c5e..5fce6b550 100644
--- a/src/components/Auth/index.tsx
+++ b/src/components/Auth/index.tsx
@@ -3,6 +3,7 @@ import * as sphinx from 'sphinx-bridge'
 import styled from 'styled-components'
 import { Flex } from '~/components/common/Flex'
 import { Text } from '~/components/common/Text'
+import { OnboardingModal } from '~/components/ModalsContainer/OnboardingFlow'
 import { isDevelopment, isE2E } from '~/constants'
 import { getIsAdmin } from '~/network/auth'
 import { useDataStore } from '~/stores/useDataStore'
@@ -18,6 +19,7 @@ export const AuthGuard = ({ children }: PropsWithChildren) => {
   const { setBudget, setIsAdmin, setPubKey, setIsAuthenticated, setSwarmUiUrl } = useUserStore((s) => s)
   const { splashDataLoading } = useDataStore((s) => s)
   const [renderMainPage, setRenderMainPage] = useState(false)
+  const [showOnboarding, setShowOnboarding] = useState(false)
 
   const {
     setTrendingTopicsFeatureFlag,
@@ -75,6 +77,10 @@ export const AuthGuard = ({ children }: PropsWithChildren) => {
         setRealtimeGraphFeatureFlag(res.data.realtimeGraph || false)
         setChatInterfaceFeatureFlag(res.data.chatInterface || false)
         setFastFiltersFeatureFlag(res.data.fastFilters || false)
+
+        if (isAdmin && !res.data.title) {
+          setShowOnboarding(true)
+        }
       }
 
       setIsAuthenticated(true)
@@ -131,6 +137,7 @@ export const AuthGuard = ({ children }: PropsWithChildren) => {
 
   return (
     <>
+      {showOnboarding && <OnboardingModal />}
       {splashDataLoading && <Splash />}
       {renderMainPage && children}
     </>
diff --git a/src/components/ModalsContainer/OnboardingFlow/GraphDetailsStep/index.tsx b/src/components/ModalsContainer/OnboardingFlow/GraphDetailsStep/index.tsx
index 5331ec103..105275862 100644
--- a/src/components/ModalsContainer/OnboardingFlow/GraphDetailsStep/index.tsx
+++ b/src/components/ModalsContainer/OnboardingFlow/GraphDetailsStep/index.tsx
@@ -37,7 +37,7 @@ export const GraphDetailsStep: FC<Props> = ({ onSubmit, error }) => {
   return (
     <Flex>
       <Flex align="center" direction="column" justify="center">
-        <StyledText>Welcome to SecondBrain!</StyledText>
+        <StyledText>Welcome to SecondBrain</StyledText>
         <StyledSubText>Set a name and short description for your graph.</StyledSubText>
       </Flex>
 
diff --git a/src/components/ModalsContainer/OnboardingFlow/index.tsx b/src/components/ModalsContainer/OnboardingFlow/index.tsx
index e8502862f..2d5123381 100644
--- a/src/components/ModalsContainer/OnboardingFlow/index.tsx
+++ b/src/components/ModalsContainer/OnboardingFlow/index.tsx
@@ -12,11 +12,7 @@ export type FormData = {
   description: string
 }
 
-type OnboardingModalProps = {
-  onSuccess: () => void
-}
-
-export const OnboardingModal = ({ onSuccess }: OnboardingModalProps) => {
+export const OnboardingModal = () => {
   const { close, visible } = useModal('onboardingFlow')
   const form = useForm<FormData>({ mode: 'onChange' })
   const { reset } = form
@@ -62,7 +58,6 @@ export const OnboardingModal = ({ onSuccess }: OnboardingModalProps) => {
       data,
       () => {
         close()
-        onSuccess()
       },
       setError,
     )
diff --git a/src/components/ModalsContainer/index.tsx b/src/components/ModalsContainer/index.tsx
index cf00851d3..c40fd3a60 100644
--- a/src/components/ModalsContainer/index.tsx
+++ b/src/components/ModalsContainer/index.tsx
@@ -1,5 +1,4 @@
 import { lazy } from 'react'
-import { useAppStore } from '~/stores/useAppStore'
 
 const LazySettingsModal = lazy(() =>
   import('../SettingsModal').then(({ SettingsModal }) => ({ default: SettingsModal })),
@@ -51,24 +50,20 @@ const LazyOnboardingModal = lazy(() =>
   import('./OnboardingFlow').then(({ OnboardingModal }) => ({ default: OnboardingModal })),
 )
 
-export const ModalsContainer = () => {
-  const { setUniverseQuestionIsOpen } = useAppStore((s) => s)
-
-  return (
-    <>
-      <LazyAddItemModal />
-      <LazyAddContentModal />
-      <LazySettingsModal />
-      <LazyEditNodeNameModal />
-      <LazyRemoveNodeModal />
-      <LazySourcesTableModal />
-      <LazyAddNodeEdgeModal />
-      <LazyChangeNodeTypeModal />
-      <LazyBlueprintModal />
-      <LazyMergeNodeModal />
-      <LazyUserFeedBackModal />
-      <LazyCreateBountyModal />
-      <LazyOnboardingModal onSuccess={setUniverseQuestionIsOpen} />
-    </>
-  )
-}
+export const ModalsContainer = () => (
+  <>
+    <LazyAddItemModal />
+    <LazyAddContentModal />
+    <LazySettingsModal />
+    <LazyEditNodeNameModal />
+    <LazyRemoveNodeModal />
+    <LazySourcesTableModal />
+    <LazyAddNodeEdgeModal />
+    <LazyChangeNodeTypeModal />
+    <LazyBlueprintModal />
+    <LazyMergeNodeModal />
+    <LazyUserFeedBackModal />
+    <LazyCreateBountyModal />
+    <LazyOnboardingModal />
+  </>
+)
diff --git a/src/types/index.ts b/src/types/index.ts
index bab9fe772..152948948 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -242,6 +242,7 @@ export type IsAdminResponse = {
     chatInterface: boolean
     swarmUiUrl: string
     fastFilters: boolean
+    title: string
   }
   success: boolean
   message: string