diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index c5ab62055cffaa1fe38931632bf3546cc44e0746..62b9547b3f793b2839b03349eb41d6cfa037669a 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,6 +1,7 @@
 {
   "recommendations": [
     "richie5um2.vscode-sort-json",
-    "lokalise.i18n-ally"
+    "lokalise.i18n-ally",
+    "biomejs.biome"
   ]
 }
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index f2d05fe7c75675b98311fe62a94c59bbf93482b6..d96cb89abccc3468d7f2731845c51faf0f1909a8 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -32,7 +32,15 @@
   "[json]": {
     "editor.codeActionsOnSave": {
       "source.fixAll": "never"
-    }
+    },
+    "editor.defaultFormatter": "biomejs.biome"
   },
-  "editor.inlineSuggest.showToolbar": "onHover"
+  "editor.inlineSuggest.showToolbar": "onHover",
+  "biome.enabled": true,
+  "[typescriptreact]": {
+    "editor.defaultFormatter": "biomejs.biome"
+  },
+  "[typescript]": {
+    "editor.defaultFormatter": "biomejs.biome"
+  }
 }
diff --git a/apps/mobile/App.tsx b/apps/mobile/App.tsx
index b5c28d87013a72b9b50a17683c550b7e02dbb9ae..892e034ba8664fd4160cb0325f0fa7824047cc8c 100644
--- a/apps/mobile/App.tsx
+++ b/apps/mobile/App.tsx
@@ -14,10 +14,10 @@ import RootProvider from '@holi/core/providers/RootProvider'
 import { subscribeToDeviceTokenChanges } from '@holi/core/screens/notifications/helpers/useDeviceToken'
 import { config } from '@holi/mobile/config'
 import NavigationProvider from '@holi/mobile/navigation/NavigationProvider'
-import RootNavigator from '@holi/mobile/navigation/RootNavigator'
 import { initNotifications } from '@holi/mobile/notifications/initNotifications'
 import defaultHoliTheme, { ThemeProvider } from '@holi/ui/styles/theme'
 import { KeyboardProvider } from 'react-native-keyboard-controller'
+import { OnboardingAwaitingNavigator } from '@holi/mobile/navigation/OnboardingAwaitingNavigator'
 
 const logger = getLogger('AppInit')
 
@@ -77,7 +77,6 @@ const App = () => {
   useEffect(() => {
     if (fontsLoaded && initDone) {
       setIsReady(true)
-      SplashScreen.hideAsync()
     }
   }, [fontsLoaded, initDone])
 
@@ -89,7 +88,7 @@ const App = () => {
         <NavigationProvider>
           <RootProvider apolloClient={apolloClient}>
             <KeyboardProvider>
-              <RootNavigator />
+              <OnboardingAwaitingNavigator onReady={SplashScreen.hideAsync} />
             </KeyboardProvider>
           </RootProvider>
         </NavigationProvider>
diff --git a/apps/mobile/navigation/NavigationProvider.tsx b/apps/mobile/navigation/NavigationProvider.tsx
index f61c6eeb136117305ac0744784bfc36aa0338ac5..b1d0371a9aa79e4815f424b0102fedbb16017530 100644
--- a/apps/mobile/navigation/NavigationProvider.tsx
+++ b/apps/mobile/navigation/NavigationProvider.tsx
@@ -1,18 +1,19 @@
 import * as Linking from 'expo-linking'
 import * as Notifications from 'expo-notifications'
 import { StatusBar } from 'expo-status-bar'
-import React from 'react'
+import type React from 'react'
 
 import type { LinkingOptions, Theme } from '@react-navigation/native'
 import { DefaultTheme, NavigationContainer, createNavigationContainerRef } from '@react-navigation/native'
 
 import { getLogger } from '@holi/core/helpers/logging'
-import { RootStackScreens } from '@holi/mobile/navigation/RootNavigator'
+import type { RootStackScreens } from '@holi/mobile/navigation/RootNavigator'
 import { appendLocaleSubPaths } from '@holi/mobile/navigation/helpers/appendLocaleSubPaths'
 import linkingConfig from '@holi/mobile/navigation/linkingConfig'
 import { screenUrlFromNotificationResponse } from '@holi/mobile/notifications'
 import { navigationIntegration } from '@holi/mobile/tracing'
-import { HoliTheme, useTheme } from '@holi/ui/styles/theme'
+import { type HoliTheme, useTheme } from '@holi/ui/styles/theme'
+import { setPathname } from '@holi/core/navigation/hooks/usePathname'
 
 const logger = getLogger('NavigationProvider')
 
@@ -28,6 +29,13 @@ const getNavigationTheme = (currentTheme: HoliTheme): Theme => ({
   dark: currentTheme.dark,
 })
 
+const syncPathname = (url: string) => {
+  const parsedUrl = Linking.parse(url)
+  if (parsedUrl?.path) {
+    setPathname('/' + parsedUrl.path)
+  }
+}
+
 // linking is done to configure deep linking (e.g. to get https://staging.dev.holi.social/profiles/dieter
 // or holi://profiles/dieter to open the corresponding screen on the app). See
 // https://reactnavigation.org/docs/deep-linking and https://reactnavigation.org/docs/configuring-links for details
@@ -49,6 +57,7 @@ export const rootLinkingConfig: LinkingOptions<RootStackScreens> = {
     const url = await Linking.getInitialURL()
     if (url != null) {
       logger.debug('LinkingOptions.getInitialURL', 'opening direct deep link', url)
+      syncPathname(url)
       return url
     }
 
@@ -62,6 +71,7 @@ export const rootLinkingConfig: LinkingOptions<RootStackScreens> = {
       const url = screenUrlFromNotificationResponse(response)
       if (url) {
         logger.debug('LinkingOptions.getInitialURL', 'navigate to deep link from push interaction', url)
+        syncPathname(url)
         return url
       }
     }
@@ -70,6 +80,7 @@ export const rootLinkingConfig: LinkingOptions<RootStackScreens> = {
     // listen to incoming links from deep linking, while app is active or in background
     const eventListenerSubscription = Linking.addEventListener('url', ({ url }: { url: string }) => {
       logger.debug('LinkingOptions.subscribe', 'received url from deeplinking', url)
+      syncPathname(url)
       listener(url)
     })
 
@@ -79,6 +90,7 @@ export const rootLinkingConfig: LinkingOptions<RootStackScreens> = {
       const url = screenUrlFromNotificationResponse(response)
       if (url) {
         logger.debug('LinkingOptions.subscribe', 'navigate to deep link from push interaction', url)
+        syncPathname(url)
         listener(url)
       }
     })
diff --git a/apps/mobile/navigation/OnboardingAwaitingNavigator.tsx b/apps/mobile/navigation/OnboardingAwaitingNavigator.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..9e9a296be1f994f277a5e2d03372a10b2fe56add
--- /dev/null
+++ b/apps/mobile/navigation/OnboardingAwaitingNavigator.tsx
@@ -0,0 +1,28 @@
+import React, { useEffect, useState } from 'react'
+import { useOnboardingInitialization, useOnboardingRedirect } from '@holi/core/screens/onboarding/hooks/onboardingState'
+import { RootNavigator } from '@holi/mobile/navigation/RootNavigator'
+
+interface OnboardingAwaitingNavigatorProps {
+  onReady: () => Promise<boolean>
+}
+
+export const OnboardingAwaitingNavigator = ({ onReady }: OnboardingAwaitingNavigatorProps) => {
+  const { isLoading } = useOnboardingInitialization()
+  const [isInitialized, setIsInitialized] = useState(false)
+  const { showOnboardingOnStartup } = useOnboardingRedirect()
+
+  useEffect(() => {
+    if (!isInitialized && !isLoading) {
+      onReady()
+      setIsInitialized(true)
+    }
+  }, [isInitialized, isLoading, onReady])
+
+  if (isLoading && !isInitialized) {
+    return null
+  }
+
+  // Overrides the "default route" of the app if onboarding should be shown.
+  // This is based on the suggested way to handle authentication by react navigation: https://reactnavigation.org/docs/auth-flow/
+  return <RootNavigator showOnboardingOnStartup={showOnboardingOnStartup} />
+}
diff --git a/apps/mobile/navigation/RootNavigator.tsx b/apps/mobile/navigation/RootNavigator.tsx
index 716dec951923d21384dacca205718a35656daeeb..a81c6481c3963e20d3d44dc2092f85b8bf37ce83 100644
--- a/apps/mobile/navigation/RootNavigator.tsx
+++ b/apps/mobile/navigation/RootNavigator.tsx
@@ -80,12 +80,16 @@ export type RootStackScreens = {
 
 const RootStack = createNativeStackNavigator<RootStackScreens>()
 
-const RootNavigator = () => {
+export interface RootNavigatorProps {
+  showOnboardingOnStartup: boolean
+}
+
+export const RootNavigator = ({ showOnboardingOnStartup }: RootNavigatorProps) => {
   const { theme } = useTheme()
   const { colors } = theme
   return (
     <RootStack.Navigator
-      initialRouteName={RouteName.BottomTabs}
+      initialRouteName={showOnboardingOnStartup ? RouteName.Onboarding : RouteName.BottomTabs}
       screenOptions={{
         headerShown: false,
         headerShadowVisible: false,
@@ -294,5 +298,3 @@ const RootNavigator = () => {
     </RootStack.Navigator>
   )
 }
-
-export default RootNavigator
diff --git a/apps/mobile/navigation/__tests__/NavigationProvider.test.ts b/apps/mobile/navigation/__tests__/NavigationProvider.test.ts
index bdc20e1bad1422d007420c61d9f01f14281d9213..93ac639e97c93b1ba6a8ee99557c959428301d84 100644
--- a/apps/mobile/navigation/__tests__/NavigationProvider.test.ts
+++ b/apps/mobile/navigation/__tests__/NavigationProvider.test.ts
@@ -1,6 +1,7 @@
-import { NotificationResponse } from 'expo-notifications'
+import type { NotificationResponse } from 'expo-notifications'
 
 import { rootLinkingConfig } from '@holi/mobile/navigation/NavigationProvider'
+import { setPathname } from '@holi/core/navigation/hooks/usePathname'
 
 jest.mock('@holi/mobile/tracing', () => ({}))
 
@@ -14,6 +15,9 @@ jest.mock('expo-linking', () => ({
   createURL: (path: string) => path,
   getInitialURL: () => mockGetInitialURL?.(),
   addEventListener: (type: string, handler: unknown) => mockAddEventListener?.(type, handler),
+  parse: (url: string) => ({
+    path: url.replace('holi://', '').replace('https://app.holi.social/', ''),
+  }),
 }))
 
 let mockGetLastNotificationResponseAsync: jest.Mock | undefined
@@ -26,6 +30,11 @@ jest.mock('expo-notifications', () => ({
     mockAddNotificationResponseReceivedListener?.(listener),
 }))
 
+const mockSetPathname = jest.mocked(setPathname)
+jest.mock('@holi/core/navigation/hooks/usePathname', () => ({
+  setPathname: jest.fn(),
+}))
+
 const notificationResponseForRemoteTriggerAndroidMock: NotificationResponse = {
   notification: {
     request: {
@@ -201,6 +210,7 @@ describe('rootLinkingConfig', () => {
 
       expect(initialUrl).toEqual('https://app.holi.social/some/link')
       expect(mockGetInitialURL).toHaveBeenCalledTimes(1)
+      expect(mockSetPathname).toHaveBeenCalledWith('/some/link')
     })
 
     describe('Android', () => {
@@ -213,6 +223,7 @@ describe('rootLinkingConfig', () => {
 
         expect(initialUrl).toEqual('holi://chat/rooms/!fefGYdkrNAqHkNfbVh:development-chat.holi.social')
         expect(mockGetLastNotificationResponseAsync).toHaveBeenCalledTimes(1)
+        expect(mockSetPathname).toHaveBeenCalledWith('/chat/rooms/!fefGYdkrNAqHkNfbVh:development-chat.holi.social')
       })
 
       it('should call getLastNotificationResponseAsync and respond correctly on local trigger', async () => {
@@ -222,6 +233,7 @@ describe('rootLinkingConfig', () => {
 
         expect(initialUrl).toEqual('holi://chat/rooms/!fefGYdkrNAqHkNfbVh:development-chat.holi.social')
         expect(mockGetLastNotificationResponseAsync).toHaveBeenCalledTimes(1)
+        expect(mockSetPathname).toHaveBeenCalledWith('/chat/rooms/!fefGYdkrNAqHkNfbVh:development-chat.holi.social')
       })
     })
 
@@ -233,6 +245,7 @@ describe('rootLinkingConfig', () => {
 
         expect(initialUrl).toEqual('holi://chat/rooms/!fefGYdkrNAqHkNfbVh:development-chat.holi.social')
         expect(mockGetLastNotificationResponseAsync).toHaveBeenCalledTimes(1)
+        expect(mockSetPathname).toHaveBeenCalledWith('/chat/rooms/!fefGYdkrNAqHkNfbVh:development-chat.holi.social')
       })
 
       it('should call getLastNotificationResponseAsync and respond correctly on iOS local trigger', async () => {
@@ -242,6 +255,7 @@ describe('rootLinkingConfig', () => {
 
         expect(initialUrl).toEqual('holi://chat/rooms/!fefGYdkrNAqHkNfbVh:development-chat.holi.social')
         expect(mockGetLastNotificationResponseAsync).toHaveBeenCalledTimes(1)
+        expect(mockSetPathname).toHaveBeenCalledWith('/chat/rooms/!fefGYdkrNAqHkNfbVh:development-chat.holi.social')
       })
     })
   })
@@ -262,6 +276,7 @@ describe('rootLinkingConfig', () => {
       registeredListener({ url: 'https://app.holi.social/some/link' })
       expect(urlResultCatcher).toHaveBeenCalledTimes(1)
       expect(urlResultCatcher).toHaveBeenCalledWith('https://app.holi.social/some/link')
+      expect(mockSetPathname).toHaveBeenCalledWith('/some/link')
     })
 
     describe('Android', () => {
@@ -279,14 +294,17 @@ describe('rootLinkingConfig', () => {
         expect(urlResultCatcher).toHaveBeenCalledWith(
           'holi://chat/rooms/!fefGYdkrNAqHkNfbVh:development-chat.holi.social'
         )
+        expect(mockSetPathname).toHaveBeenCalledWith('/chat/rooms/!fefGYdkrNAqHkNfbVh:development-chat.holi.social')
 
         urlResultCatcher.mockClear()
+        mockSetPathname.mockClear()
 
         registeredListener(notificationResponseForLocalTriggerAndroidMock)
         expect(urlResultCatcher).toHaveBeenCalledTimes(1)
         expect(urlResultCatcher).toHaveBeenCalledWith(
           'holi://chat/rooms/!fefGYdkrNAqHkNfbVh:development-chat.holi.social'
         )
+        expect(mockSetPathname).toHaveBeenCalledWith('/chat/rooms/!fefGYdkrNAqHkNfbVh:development-chat.holi.social')
       })
     })
 
@@ -305,14 +323,17 @@ describe('rootLinkingConfig', () => {
         expect(urlResultCatcher).toHaveBeenCalledWith(
           'holi://chat/rooms/!fefGYdkrNAqHkNfbVh:development-chat.holi.social'
         )
+        expect(mockSetPathname).toHaveBeenCalledWith('/chat/rooms/!fefGYdkrNAqHkNfbVh:development-chat.holi.social')
 
         urlResultCatcher.mockClear()
+        mockSetPathname.mockClear()
 
         registeredListener(notificationResponseForLocalTriggerIosMock)
         expect(urlResultCatcher).toHaveBeenCalledTimes(1)
         expect(urlResultCatcher).toHaveBeenCalledWith(
           'holi://chat/rooms/!fefGYdkrNAqHkNfbVh:development-chat.holi.social'
         )
+        expect(mockSetPathname).toHaveBeenCalledWith('/chat/rooms/!fefGYdkrNAqHkNfbVh:development-chat.holi.social')
       })
     })
 
@@ -330,6 +351,7 @@ describe('rootLinkingConfig', () => {
 
       expect(removeMockForAddEventListener).toHaveBeenCalledTimes(1)
       expect(removeMockForAddNotificationResponseReceivedListener).toHaveBeenCalledTimes(1)
+      expect(mockSetPathname).not.toHaveBeenCalled()
     })
   })
 })
diff --git a/apps/mobile/navigation/__tests__/OnboardingAwaitingNavigator.test.tsx b/apps/mobile/navigation/__tests__/OnboardingAwaitingNavigator.test.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..2ebe917410e019920ae12bb1df07d0766e930f99
--- /dev/null
+++ b/apps/mobile/navigation/__tests__/OnboardingAwaitingNavigator.test.tsx
@@ -0,0 +1,130 @@
+import React from 'react'
+import { useOnboardingInitialization, useOnboardingRedirect } from '@holi/core/screens/onboarding/hooks/onboardingState'
+import { OnboardingAwaitingNavigator } from '@holi/mobile/navigation/OnboardingAwaitingNavigator'
+import { render, screen } from '@testing-library/react-native'
+import { Text } from 'holi-bricks/components/text'
+import type { RootNavigatorProps } from '@holi/mobile/navigation/RootNavigator'
+
+const mockUseOnboardingInitialization = jest.mocked(useOnboardingInitialization)
+const mockUseOnboardingRedirect = jest.mocked(useOnboardingRedirect)
+jest.mock('@holi/core/screens/onboarding/hooks/onboardingState', () => ({
+  useOnboardingInitialization: jest.fn(),
+  useOnboardingRedirect: jest.fn(),
+}))
+
+const MockedRootNavigator = ({ showOnboardingOnStartup }: RootNavigatorProps) => (
+  <Text size="md">{showOnboardingOnStartup ? 'onboarding' : 'something else'}</Text>
+)
+
+jest.mock('@holi/mobile/navigation/RootNavigator', () => ({
+  RootNavigator: (props: RootNavigatorProps) => MockedRootNavigator(props),
+}))
+
+describe('OnboardingAwaitingNavigator', () => {
+  const mockIsInitializing = () => {
+    mockUseOnboardingInitialization.mockReturnValue({
+      isLoading: true,
+      onboardingState: null,
+    })
+  }
+  const mockFinishedInitialization = () => {
+    mockUseOnboardingInitialization.mockReturnValue({
+      isLoading: false,
+      onboardingState: 'finished',
+    })
+  }
+
+  beforeEach(() => {
+    mockFinishedInitialization()
+    mockUseOnboardingRedirect.mockReturnValue({
+      showOnboardingOnStartup: false,
+    })
+  })
+
+  it('should render null while onboarding is initializing', () => {
+    mockIsInitializing()
+
+    render(<OnboardingAwaitingNavigator onReady={jest.fn()} />)
+
+    expect(screen.toJSON()).toBeNull()
+  })
+
+  it('should call onReady when onboarding is initialized', () => {
+    const onReadyMock = jest.fn()
+
+    render(<OnboardingAwaitingNavigator onReady={onReadyMock} />)
+
+    expect(onReadyMock).toHaveBeenCalled()
+  })
+
+  it('should call onReady callback only once', () => {
+    const onReadyMock = jest.fn()
+
+    // Onboarding initialized > onReady called
+    mockFinishedInitialization()
+
+    const { rerender } = render(<OnboardingAwaitingNavigator onReady={onReadyMock} />)
+
+    expect(onReadyMock).toHaveBeenCalled()
+
+    // Onboarding re-initializing > no call
+    onReadyMock.mockClear()
+    mockIsInitializing()
+
+    rerender(<OnboardingAwaitingNavigator onReady={onReadyMock} />)
+
+    expect(onReadyMock).not.toHaveBeenCalled()
+
+    // Onboarding re-initialized > no call
+    mockFinishedInitialization()
+
+    rerender(<OnboardingAwaitingNavigator onReady={onReadyMock} />)
+
+    expect(onReadyMock).not.toHaveBeenCalled()
+  })
+
+  it('should not render null again after initialized once', () => {
+    // First render: initializing > null
+    mockIsInitializing()
+
+    const { rerender } = render(<OnboardingAwaitingNavigator onReady={jest.fn()} />)
+
+    expect(screen.toJSON()).toBeNull()
+
+    // Second render: finish initialization > RootNavigator
+    mockFinishedInitialization()
+
+    rerender(<OnboardingAwaitingNavigator onReady={jest.fn()} />)
+
+    expect(screen.getByText('something else')).toBeTruthy()
+
+    // Third render: re-initializing > RootNavigator
+    mockIsInitializing()
+
+    rerender(<OnboardingAwaitingNavigator onReady={jest.fn()} />)
+
+    expect(screen.getByText('something else')).toBeTruthy()
+  })
+
+  it('should render RootNavigator once onboarding is initialized', () => {
+    render(<OnboardingAwaitingNavigator onReady={jest.fn()} />)
+
+    expect(screen.getByText('something else')).toBeTruthy()
+  })
+
+  it('should pass truthy showOnboarding prop to RootNavigator if onboarding is required', () => {
+    mockUseOnboardingRedirect.mockReturnValue({
+      showOnboardingOnStartup: true,
+    })
+
+    render(<OnboardingAwaitingNavigator onReady={jest.fn()} />)
+
+    expect(screen.getByText('onboarding')).toBeTruthy()
+  })
+
+  it('should pass falsy showOnboarding prop to RootNavigator if onboarding is not required', () => {
+    render(<OnboardingAwaitingNavigator onReady={jest.fn()} />)
+
+    expect(screen.getByText('something else')).toBeTruthy()
+  })
+})
diff --git a/apps/web/__tests__/helpers.ts b/apps/web/__tests__/helpers.ts
index b1b89be32554f7f6fc567d1ca575c6229d0e5442..c1f8420a6c3132e78878b844ef7698f7e5112283 100644
--- a/apps/web/__tests__/helpers.ts
+++ b/apps/web/__tests__/helpers.ts
@@ -1,10 +1,10 @@
 import type { IncomingMessage, ServerResponse } from 'http'
 import { graphql } from 'msw'
-import type { NextPageContext } from 'next'
+import type { GetServerSidePropsContext } from 'next'
 
 export const graphqlLink = graphql.link('http://localhost:3000/api/graphql')
 
-export const createPageContextMock = ({ locale = 'en', ...overrides }: Partial<NextPageContext> = {}) => {
+export const createPageContextMock = ({ locale = 'en', ...overrides }: Partial<GetServerSidePropsContext> = {}) => {
   const writeMock = jest.fn()
   const setHeaderMock = jest.fn()
   // @ts-ignore
@@ -14,7 +14,7 @@ export const createPageContextMock = ({ locale = 'en', ...overrides }: Partial<N
     end: jest.fn(),
   }
 
-  const context = { res, locale, ...overrides } as NextPageContext
+  const context = { res, locale, ...overrides } as GetServerSidePropsContext
 
   return { context, writeMock, setHeaderMock }
 }
diff --git a/apps/web/__tests__/sitemap/insights.page.test.ts b/apps/web/__tests__/sitemap/insights.page.test.ts
index 04777d4ad6b9408d2b1c1b4667a47c949dc046c7..9ec60e44aea148f9631503f668d8ed09960bb96c 100644
--- a/apps/web/__tests__/sitemap/insights.page.test.ts
+++ b/apps/web/__tests__/sitemap/insights.page.test.ts
@@ -1,6 +1,6 @@
 import { HttpResponse } from 'msw'
 import { setupServer } from 'msw/node'
-import { NextPageContext } from 'next'
+import type { GetServerSidePropsContext } from 'next'
 
 import { createPageContextMock, graphqlLink } from '@holi/web/__tests__/helpers'
 import { getServerSideProps, insightsWithRelatedIdsQuery } from '@holi/web/pages/sitemap/insights/[page]'
@@ -226,7 +226,7 @@ describe('Insights sitemap page', () => {
   it('should render sitemap for paginated insights for german locale', async () => {
     const { context, writeMock } = createPageContextMock({ query: { page: '0' }, locale: 'de' })
 
-    await getServerSideProps(context as NextPageContext)
+    await getServerSideProps(context as GetServerSidePropsContext)
 
     const response = writeMock.mock.lastCall[0]
     expect(response).toMatchInlineSnapshot(`
@@ -405,7 +405,7 @@ describe('Insights sitemap page', () => {
   it('should set correct content type', async () => {
     const { context, setHeaderMock } = createPageContextMock({ query: { page: '0' } })
 
-    await getServerSideProps(context as NextPageContext)
+    await getServerSideProps(context as GetServerSidePropsContext)
 
     expect(setHeaderMock).toHaveBeenCalledWith('Content-Type', 'text/xml')
   })
diff --git a/apps/web/__tests__/sitemap/insights.xml.test.ts b/apps/web/__tests__/sitemap/insights.xml.test.ts
index 8747e9bd2008c3e6153ee09cdb5893f361bbad4f..d576ea531f9816558aa8aad6e8edc1321957f47a 100644
--- a/apps/web/__tests__/sitemap/insights.xml.test.ts
+++ b/apps/web/__tests__/sitemap/insights.xml.test.ts
@@ -1,6 +1,6 @@
 import { HttpResponse } from 'msw'
 import { setupServer } from 'msw/node'
-import { NextPageContext } from 'next'
+import type { GetServerSidePropsContext } from 'next'
 
 import { createPageContextMock, graphqlLink } from '@holi/web/__tests__/helpers'
 import { getServerSideProps, insightsCountQuery } from '@holi/web/pages/sitemap/insights.xml'
@@ -51,7 +51,7 @@ describe('Insights sitemap index', () => {
   it('should render sitemap index for insights for german locale', async () => {
     const { context, writeMock } = createPageContextMock({ locale: 'de' })
 
-    await getServerSideProps(context as NextPageContext)
+    await getServerSideProps(context as GetServerSidePropsContext)
 
     const response = writeMock.mock.lastCall[0]
     expect(response).toMatchInlineSnapshot(`
@@ -71,7 +71,7 @@ describe('Insights sitemap index', () => {
   it('should set correct content type', async () => {
     const { context, setHeaderMock } = createPageContextMock()
 
-    await getServerSideProps(context as NextPageContext)
+    await getServerSideProps(context as GetServerSidePropsContext)
 
     expect(setHeaderMock).toHaveBeenCalledWith('Content-Type', 'text/xml')
   })
diff --git a/apps/web/__tests__/sitemap/sitemap.xml.test.ts b/apps/web/__tests__/sitemap/sitemap.xml.test.ts
index 929ebf3901ae1a538c4a77d47b19e5484a72a6e5..0680e0036ab3f2d7479fc3ee5e96fdf657d98d4e 100644
--- a/apps/web/__tests__/sitemap/sitemap.xml.test.ts
+++ b/apps/web/__tests__/sitemap/sitemap.xml.test.ts
@@ -1,4 +1,4 @@
-import { NextPageContext } from 'next'
+import type { GetServerSidePropsContext } from 'next'
 
 import { createPageContextMock } from '@holi/web/__tests__/helpers'
 import { getServerSideProps } from '@holi/web/pages/sitemap.xml'
@@ -37,7 +37,7 @@ describe('Root sitemap', () => {
   it('should set correct content type', async () => {
     const { context, setHeaderMock } = createPageContextMock()
 
-    await getServerSideProps(context as NextPageContext)
+    await getServerSideProps(context as GetServerSidePropsContext)
 
     expect(setHeaderMock).toHaveBeenCalledWith('Content-Type', 'text/xml')
   })
diff --git a/apps/web/__tests__/sitemap/static.xml.test.ts b/apps/web/__tests__/sitemap/static.xml.test.ts
index 266e91404fa0c2de13310a60326c8a41673128f4..fd0177f35e18dc1b711f12105e71daf9003392ae 100644
--- a/apps/web/__tests__/sitemap/static.xml.test.ts
+++ b/apps/web/__tests__/sitemap/static.xml.test.ts
@@ -1,5 +1,5 @@
 import { setupServer } from 'msw/node'
-import type { NextPageContext } from 'next'
+import type { GetServerSidePropsContext } from 'next'
 
 import { createPageContextMock } from '@holi/web/__tests__/helpers'
 import { getServerSideProps } from '@holi/web/pages/sitemap/static.xml'
@@ -130,7 +130,7 @@ describe('Static sitemap index', () => {
   it('should render sitemap index with static urls for german locale', async () => {
     const { context, writeMock } = createPageContextMock({ locale: 'de' })
 
-    await getServerSideProps(context as NextPageContext)
+    await getServerSideProps(context as GetServerSidePropsContext)
 
     const response = writeMock.mock.lastCall[0]
     expect(response).toMatchInlineSnapshot(`
@@ -240,7 +240,7 @@ describe('Static sitemap index', () => {
   it('should set correct content type', async () => {
     const { context, setHeaderMock } = createPageContextMock()
 
-    await getServerSideProps(context as NextPageContext)
+    await getServerSideProps(context as GetServerSidePropsContext)
 
     expect(setHeaderMock).toHaveBeenCalledWith('Content-Type', 'text/xml')
   })
diff --git a/apps/web/helpers/__tests__/createServerSideProps.test.ts b/apps/web/helpers/__tests__/createServerSideProps.test.ts
index c1df22cfb8d4effcea93e081394bbdb4652b42d9..077a7a8447435e27b9c695ddcf64475913b5d9d6 100644
--- a/apps/web/helpers/__tests__/createServerSideProps.test.ts
+++ b/apps/web/helpers/__tests__/createServerSideProps.test.ts
@@ -1,11 +1,15 @@
 import { ApolloError, gql } from '@apollo/client'
 import { GraphQLError } from 'graphql'
-import type { NextPageContext } from 'next'
 
-import { WebApolloClientOptions } from '@holi/api/graphql/client'
-import { createServerSideProps } from '@holi/web/helpers/createServerSideProps'
+import type { WebApolloClientOptions } from '@holi/api/graphql/client'
+import {
+  createServerSideProps,
+  createServerSidePropsWithLoggedInUserGuard,
+} from '@holi/web/helpers/createServerSideProps'
 import { HoliPageProps } from '@holi/web/types'
 import { createUUID } from '@holi/core/helpers'
+import { GUEST_MODE_COOKIE_NAME } from '@holi/core/screens/onboarding/helpers/guestModeStorage.web'
+import type { GetServerSidePropsContext } from 'next'
 
 const mockLoadTranslations = jest.fn()
 jest.mock('ni18n', () => ({
@@ -30,7 +34,7 @@ describe('createServerSideProps', () => {
     accept: 'application/json',
     'accept-encoding': 'gzip',
   }
-  const context = { req: { url: '', headers } } as unknown as NextPageContext
+  const context = { req: { url: '', headers } } as unknown as GetServerSidePropsContext
   const mockedTranslations = { __ni18n_server__: { resources: {}, ns: [] } }
   const mockPosthogBootstrapValues = {
     featureFlags: { DONATIONS: 'on' },
@@ -39,18 +43,24 @@ describe('createServerSideProps', () => {
   const mockedCache = {
     foo: 'bar',
   }
-  const minimalProps = {
+  const minimalProps = HoliPageProps.from({
     locale: 'en',
     origin,
+  })
+  const loggedOutUserProps = {
+    isLoggedOut: true,
+    guestMode: false,
+  }
+  const guestUserProps = {
+    isLoggedOut: true,
+    guestMode: true,
   }
-  const loggedOutUserProps = { isLoggedOut: true }
-  const expectedProps = HoliPageProps.from({
-    ...minimalProps,
+  const expectedProps = minimalProps.with({
     translations: mockedTranslations,
     apolloState: mockedCache,
     posthogBootstrapValues: mockPosthogBootstrapValues,
     user: loggedOutUserProps,
-  }).props
+  })
   const query1 = {
     query: gql`
       query {
@@ -78,6 +88,36 @@ describe('createServerSideProps', () => {
     },
   }
 
+  type UserType = 'loggedIn' | 'incompleteAccount' | 'guest' | 'newUser' | 'bot'
+  const setupAndCreateContextForUser = (
+    userContextType: UserType,
+    requestOverrides = {}
+  ): GetServerSidePropsContext => {
+    const userData =
+      userContextType === 'loggedIn'
+        ? { id: 'test-user-id', identity: 'ada', firstName: 'Ada' }
+        : userContextType === 'incompleteAccount'
+          ? { id: 'test-user-id' }
+          : undefined
+    if (userData) {
+      mockQueryFunction.mockResolvedValue({
+        data: { authenticatedUserV2: userData },
+      })
+    }
+    const cookies = userContextType === 'guest' ? { [GUEST_MODE_COOKIE_NAME]: 'true' } : {}
+    const headers = userContextType === 'bot' ? { 'user-agent': 'Googlebot/2.1' } : {}
+
+    return {
+      ...context,
+      req: {
+        ...context.req,
+        ...requestOverrides,
+        cookies,
+        headers,
+      },
+    } as unknown as GetServerSidePropsContext
+  }
+
   beforeEach(() => {
     mockQueryFunction.mockResolvedValue({ data: {} })
     mockLoadTranslations.mockResolvedValue(mockedTranslations)
@@ -85,127 +125,154 @@ describe('createServerSideProps', () => {
     mockCreatePosthogPageProps.mockReturnValue(mockPosthogBootstrapValues)
   })
 
-  it('should load and add translations to page props', async () => {
-    const props = await createServerSideProps(context)
+  describe('locale & translations', () => {
+    it('should load and add translations to page props', async () => {
+      const props = await createServerSideProps(context)
 
-    expect(mockLoadTranslations).toHaveBeenCalled()
-    expect(props).toEqual({
-      props: expectedProps,
+      expect(mockLoadTranslations).toHaveBeenCalled()
+      expect(props).toEqual(expectedProps)
     })
-  })
 
-  it('should add valid locale to page props', async () => {
-    const props = await createServerSideProps({
-      req: { url: '', headers: { 'accept-language': 'default' } },
-    } as unknown as NextPageContext)
+    it('should add valid locale to page props', async () => {
+      const props = await createServerSideProps({
+        req: { url: '', headers: { 'accept-language': 'default' } },
+      } as unknown as GetServerSidePropsContext)
 
-    expect(new HoliPageProps(props).props.locale).toEqual('en')
+      expect(new HoliPageProps(props).props.locale).toEqual('en')
+    })
   })
 
-  it('should execute list of queries and pass request headers', async () => {
-    await createServerSideProps({ ...context, locale: 'de' }, [query1, query2])
+  describe('queries & apollo state', () => {
+    it('should execute list of queries and pass request headers', async () => {
+      await createServerSideProps({ ...context, locale: 'de' }, [query1, query2])
 
-    expect(mockInitializeWebApolloClient).toHaveBeenCalledWith({ headers, locale: 'de' })
-    expect(mockQueryFunction).toHaveBeenCalledTimes(2 + 1) // query1, query2 + authenticatedUser
-    expect(mockQueryFunction).toHaveBeenCalledWith(query1)
-    expect(mockQueryFunction).toHaveBeenCalledWith(query2)
-  })
+      expect(mockInitializeWebApolloClient).toHaveBeenCalledWith({ headers, locale: 'de' })
+      expect(mockQueryFunction).toHaveBeenCalledTimes(2 + 1) // query1, query2 + authenticatedUser
+      expect(mockQueryFunction).toHaveBeenCalledWith(query1)
+      expect(mockQueryFunction).toHaveBeenCalledWith(query2)
+    })
 
-  it('should add apollo state to page props after executing queries', async () => {
-    const props = await createServerSideProps(context, [query1, query2])
+    it('should add apollo state to page props after executing queries', async () => {
+      const props = await createServerSideProps(context, [query1, query2])
 
-    expect(new HoliPageProps(props).apolloState).toEqual(mockedCache)
-  })
+      expect(new HoliPageProps(props).apolloState).toEqual(mockedCache)
+    })
 
-  it('should add apollo state to page props even if a query fails', async () => {
-    mockQueryFunction.mockResolvedValueOnce({ data: {} }) // Let user query succeed
-    mockQueryFunction.mockRejectedValueOnce(new Error('test'))
+    it('should add apollo state to page props even if a query fails', async () => {
+      mockQueryFunction.mockResolvedValueOnce({ data: {} }) // Let user query succeed
+      mockQueryFunction.mockRejectedValueOnce(new Error('test'))
 
-    const props = await createServerSideProps(context, [query1, query2])
+      const props = await createServerSideProps(context, [query1, query2])
 
-    expect(mockQueryFunction).toHaveBeenCalledTimes(2 + 1) // query1, query2 + authenticatedUser
-    expect(mockQueryFunction).toHaveBeenCalledWith(query1)
-    expect(mockQueryFunction).toHaveBeenCalledWith(query2)
-    expect(new HoliPageProps(props).apolloState).toEqual(mockedCache)
-  })
+      expect(mockQueryFunction).toHaveBeenCalledTimes(2 + 1) // query1, query2 + authenticatedUser
+      expect(mockQueryFunction).toHaveBeenCalledWith(query1)
+      expect(mockQueryFunction).toHaveBeenCalledWith(query2)
+      expect(new HoliPageProps(props).apolloState).toEqual(mockedCache)
+    })
 
-  it('should not execute queries that should be skipped', async () => {
-    await createServerSideProps(context, [{ ...query1, skip: true }, query2])
+    it('should not execute queries that should be skipped', async () => {
+      await createServerSideProps(context, [{ ...query1, skip: true }, query2])
 
-    expect(mockQueryFunction).toHaveBeenCalledTimes(1 + 1) // query2 + authenticatedUser
-    expect(mockQueryFunction).not.toHaveBeenCalledWith(query1)
-    expect(mockQueryFunction).toHaveBeenCalledWith(query2)
-  })
+      expect(mockQueryFunction).toHaveBeenCalledTimes(1 + 1) // query2 + authenticatedUser
+      expect(mockQueryFunction).not.toHaveBeenCalledWith(query1)
+      expect(mockQueryFunction).toHaveBeenCalledWith(query2)
+    })
 
-  it('should redirect to 404 page if a query results in a NOT_FOUND error', async () => {
-    mockQueryFunction.mockResolvedValueOnce({ data: {} }) // Let user query succeed
-    mockQueryFunction.mockRejectedValueOnce(
-      new ApolloError({
-        graphQLErrors: [
-          new GraphQLError('Not found', {
-            extensions: {
-              code: 'NOT_FOUND',
-            },
-          }),
-        ],
+    it('should redirect to 404 page if a query results in a NOT_FOUND error', async () => {
+      mockQueryFunction.mockResolvedValueOnce({ data: {} }) // Let user query succeed
+      mockQueryFunction.mockRejectedValueOnce(
+        new ApolloError({
+          graphQLErrors: [
+            new GraphQLError('Not found', {
+              extensions: {
+                code: 'NOT_FOUND',
+              },
+            }),
+          ],
+        })
+      )
+
+      const props = await createServerSideProps(context, [query1, query2])
+
+      expect(mockQueryFunction).toHaveBeenCalledTimes(2 + 1) // query1, query2 + authenticatedUser
+      expect(mockQueryFunction).toHaveBeenCalledWith(query1)
+      expect(mockQueryFunction).toHaveBeenCalledWith(query2)
+      expect(props).toEqual({
+        notFound: true,
       })
-    )
+    })
 
-    const props = await createServerSideProps(context, [query1, query2])
+    it('should redirect on invalid UUID params before executing any queries', async () => {
+      const uuid1 = createUUID()
+      const uuid2 = createUUID()
+      const param1 = `${uuid1},`
+      const param2 = `${uuid2}👀`
+      const url = `/path/${encodeURIComponent(param1)}/${encodeURIComponent(param2)}`
+      const expectedUrl = `/path/${uuid1}/${uuid2}`
+
+      // @ts-ignore
+      const props = await createServerSideProps({ req: { url } }, [query1], { uuidParams: [param1, param2] })
+
+      expect(mockQueryFunction).not.toHaveBeenCalled()
+      expect(props).toEqual({
+        redirect: {
+          destination: expectedUrl,
+          permanent: true,
+        },
+      })
+    })
+
+    it('should not redirect on valid UUID params', async () => {
+      const param1 = createUUID()
+      const param2 = createUUID()
+      const url = `/path/${param1}/${param2}`
+      const customProps = { uuidParams: [param1, param2] }
+
+      // @ts-ignore
+      const props = await createServerSideProps({ req: { url } }, [query1], customProps)
 
-    expect(mockQueryFunction).toHaveBeenCalledTimes(2 + 1) // query1, query2 + authenticatedUser
-    expect(mockQueryFunction).toHaveBeenCalledWith(query1)
-    expect(mockQueryFunction).toHaveBeenCalledWith(query2)
-    expect(props).toEqual({
-      notFound: true,
+      expect(mockQueryFunction).toHaveBeenCalledWith(query1)
+      expect(props).toEqual(expectedProps.with({ customProps }))
     })
   })
 
   it('only adds minimal props if not the first request', async () => {
     // @ts-ignore
-    const { props } = await createServerSideProps({ req: { url: '/_next/data/' } }, [])
+    const props = await createServerSideProps({ req: { url: '/_next/data/' } }, [])
 
     expect(props).toEqual(minimalProps)
     expect(mockInitializeWebApolloClient).not.toHaveBeenCalled()
     expect(mockLoadTranslations).not.toHaveBeenCalled()
   })
 
-  it('passes on custom props', async () => {
-    const customProps = {
-      seoTitle: 'foobar',
-      urls: {
-        en: '/donations',
-        de: '/spenden',
-      },
-    }
-    const props = await createServerSideProps(context, [], customProps)
+  describe('custom props', () => {
+    it('passes on custom props', async () => {
+      const customProps = {
+        seoTitle: 'foobar',
+        urls: {
+          en: '/donations',
+          de: '/spenden',
+        },
+      }
+      const props = await createServerSideProps(context, [], customProps)
 
-    expect(mockLoadTranslations).toHaveBeenCalled()
-    expect(props).toEqual({
-      props: {
-        ...expectedProps,
-        customProps,
-      },
+      expect(mockLoadTranslations).toHaveBeenCalled()
+      expect(props).toEqual(expectedProps.with({ customProps }))
     })
-  })
 
-  it('passes on custom props even if not the first request', async () => {
-    const customProps = {
-      seoTitle: 'foobar',
-      urls: {
-        en: '/donations',
-        de: '/spenden',
-      },
-    }
-    // @ts-ignore
-    const props = await createServerSideProps({ req: { url: '/_next/data/' } }, [], customProps)
+    it('passes on custom props even if not the first request', async () => {
+      const customProps = {
+        seoTitle: 'foobar',
+        urls: {
+          en: '/donations',
+          de: '/spenden',
+        },
+      }
+      // @ts-ignore
+      const props = await createServerSideProps({ req: { url: '/_next/data/' } }, [], customProps)
 
-    expect(mockLoadTranslations).not.toHaveBeenCalled()
-    expect(props).toEqual({
-      props: {
-        ...minimalProps,
-        customProps,
-      },
+      expect(mockLoadTranslations).not.toHaveBeenCalled()
+      expect(props).toEqual(minimalProps.with({ customProps }))
     })
   })
 
@@ -214,88 +281,299 @@ describe('createServerSideProps', () => {
       host: 'localhost:3000',
       'x-forwarded-proto': 'http',
     }
-    const context = { req: { url: '', headers } } as unknown as NextPageContext
+    const context = { req: { url: '', headers } } as unknown as GetServerSidePropsContext
 
     const props = await createServerSideProps(context)
 
     expect(mockLoadTranslations).toHaveBeenCalled()
-    expect(props).toEqual({
-      props: {
-        ...expectedProps,
+    expect(props).toEqual(
+      expectedProps.with({
         origin: 'http://localhost:3000',
-      },
-    })
+      })
+    )
   })
 
-  it('should add default posthog bootstrap values if user is not logged in', async () => {
-    const props = await createServerSideProps(context)
+  describe('posthog', () => {
+    it('should add default posthog bootstrap values if user is not logged in', async () => {
+      const props = await createServerSideProps(context)
 
-    expect(mockCreatePosthogPageProps).toHaveBeenCalledWith(undefined)
-    expect(new HoliPageProps(props).posthogBootstrapValues).toEqual(mockPosthogBootstrapValues)
-  })
+      expect(mockCreatePosthogPageProps).toHaveBeenCalledWith(undefined)
+      expect(new HoliPageProps(props).posthogBootstrapValues).toEqual(mockPosthogBootstrapValues)
+    })
 
-  it('should add user specific posthog bootstrap values if user is logged in', async () => {
-    const userId = 'test-user-id'
-    mockQueryFunction.mockResolvedValue({ data: { authenticatedUserV2: { id: userId } } })
-    const props = await createServerSideProps(context)
+    it('should add user specific posthog bootstrap values if user is logged in', async () => {
+      const userId = 'test-user-id'
+      const context = setupAndCreateContextForUser('loggedIn')
+      const props = await createServerSideProps(context)
 
-    expect(mockCreatePosthogPageProps).toHaveBeenCalledWith(userId)
-    expect(new HoliPageProps(props).posthogBootstrapValues).toEqual(mockPosthogBootstrapValues)
+      expect(mockCreatePosthogPageProps).toHaveBeenCalledWith(userId)
+      expect(new HoliPageProps(props).posthogBootstrapValues).toEqual(mockPosthogBootstrapValues)
+    })
   })
 
-  it('should add logged out user props if user is not logged in', async () => {
-    const props = await createServerSideProps(context)
+  describe('user props', () => {
+    it('should add logged out user props if user is not logged in', async () => {
+      const props = await createServerSideProps(context)
 
-    expect(new HoliPageProps(props).user).toEqual(loggedOutUserProps)
-  })
+      expect(new HoliPageProps(props).user).toEqual(loggedOutUserProps)
+    })
 
-  it('should add logged in user props if user is logged in', async () => {
-    const userId = 'test-user-id'
-    const expectedUserProps = {
-      id: userId,
-      isLoggedOut: false,
-    }
-    mockQueryFunction.mockResolvedValue({ data: { authenticatedUserV2: { id: userId } } })
-    const props = await createServerSideProps(context)
+    it('should add guest user props if user is guest', async () => {
+      const guestContext = setupAndCreateContextForUser('guest')
+
+      const props = await createServerSideProps(guestContext)
+
+      expect(new HoliPageProps(props).user).toEqual(guestUserProps)
+    })
+
+    it('should add guest user props if user is a bot', async () => {
+      const botContext = setupAndCreateContextForUser('bot')
 
-    expect(new HoliPageProps(props).user).toEqual(expectedUserProps)
+      const props = await createServerSideProps(botContext)
+
+      expect(new HoliPageProps(props).user).toEqual(guestUserProps)
+    })
+
+    it('should add logged in user props if user is logged in with complete account', async () => {
+      const userId = 'test-user-id'
+      const expectedUserProps = {
+        id: userId,
+        isLoggedOut: false,
+        accountCompleted: true,
+      }
+      const context = setupAndCreateContextForUser('loggedIn')
+      const props = await createServerSideProps(context)
+
+      expect(new HoliPageProps(props).user).toEqual(expectedUserProps)
+    })
   })
 
-  it('should redirect on invalid UUID params before executing any queries', async () => {
-    const uuid1 = createUUID()
-    const uuid2 = createUUID()
-    const param1 = `${uuid1},`
-    const param2 = `${uuid2}👀`
-    const url = `/path/${encodeURIComponent(param1)}/${encodeURIComponent(param2)}`
-    const expectedUrl = `/path/${uuid1}/${uuid2}`
+  describe('onboarding state-dependent redirects', () => {
+    type RedirectTestData = { userType: UserType; expectedRedirect: boolean }
+    describe('incomplete account', () => {
+      const testData: RedirectTestData[] = [
+        {
+          userType: 'loggedIn',
+          expectedRedirect: false,
+        },
+        {
+          userType: 'incompleteAccount',
+          expectedRedirect: true,
+        },
+        {
+          userType: 'newUser',
+          expectedRedirect: false,
+        },
+        {
+          userType: 'guest',
+          expectedRedirect: false,
+        },
+        {
+          userType: 'bot',
+          expectedRedirect: false,
+        },
+      ]
+      it.each(testData)(
+        'should correctly handle onboarding redirect for user of type $userType',
+        async ({ userType, expectedRedirect }) => {
+          const context = setupAndCreateContextForUser(userType)
+          const props = await createServerSideProps(context)
+
+          if (expectedRedirect) {
+            expect(props).toEqual({
+              redirect: {
+                destination: '/onboarding',
+                permanent: false,
+              },
+            })
+          } else {
+            expect('redirect' in props).toBeFalsy()
+          }
+        }
+      )
 
-    // @ts-ignore
-    const props = await createServerSideProps({ req: { url } }, [query1], { uuidParams: [param1, param2] })
+      it('should not redirect to onboarding page if already there', async () => {
+        const contextOnboarding = setupAndCreateContextForUser('incompleteAccount', { url: '/onboarding' })
+        const props = await createServerSideProps(contextOnboarding)
 
-    expect(mockQueryFunction).not.toHaveBeenCalled()
-    expect(props).toEqual({
-      redirect: {
-        destination: expectedUrl,
-        permanent: true,
-      },
+        expect('redirect' in props).toBeFalsy()
+      })
+    })
+
+    describe('logged in users', () => {
+      const testData: RedirectTestData[] = [
+        {
+          userType: 'loggedIn',
+          expectedRedirect: true,
+        },
+        {
+          userType: 'newUser',
+          expectedRedirect: false,
+        },
+        {
+          userType: 'guest',
+          expectedRedirect: false,
+        },
+        {
+          userType: 'bot',
+          expectedRedirect: false,
+        },
+      ]
+      it.each(testData)(
+        'should correctly handle redirect for logged in users if user is of type $userType',
+        async ({ userType, expectedRedirect }) => {
+          const context = setupAndCreateContextForUser(userType)
+          const props = await createServerSideProps(context, [], {
+            redirectRouteForLoggedInUsers: '/some-page',
+          })
+
+          if (expectedRedirect) {
+            expect(props).toEqual({
+              redirect: {
+                destination: '/some-page',
+                permanent: false,
+              },
+            })
+          } else {
+            expect('redirect' in props).toBeFalsy()
+          }
+        }
+      )
+
+      it('should not redirect to specified page if already there', async () => {
+        const contextOnboarding = setupAndCreateContextForUser('loggedIn', { url: '/some-page' })
+        const props = await createServerSideProps(contextOnboarding, [], {
+          redirectRouteForLoggedInUsers: '/some-page',
+        })
+
+        expect('redirect' in props).toBeFalsy()
+      })
+    })
+
+    describe('logged out users', () => {
+      const testData: RedirectTestData[] = [
+        {
+          userType: 'loggedIn',
+          expectedRedirect: false,
+        },
+        {
+          userType: 'newUser',
+          expectedRedirect: true,
+        },
+        {
+          userType: 'guest',
+          expectedRedirect: true,
+        },
+        {
+          userType: 'bot',
+          expectedRedirect: true,
+        },
+      ]
+      it.each(testData)(
+        'should correctly handle redirect for logged out users if user is of type $userType',
+        async ({ userType, expectedRedirect }) => {
+          const context = setupAndCreateContextForUser(userType)
+          const props = await createServerSideProps(context, [], {
+            redirectRouteForLoggedOutUsers: '/some-page',
+          })
+
+          if (expectedRedirect) {
+            expect(props).toEqual({
+              redirect: {
+                destination: '/some-page',
+                permanent: false,
+              },
+            })
+          } else {
+            expect('redirect' in props).toBeFalsy()
+          }
+        }
+      )
+
+      it('should not redirect to specified page if already there', async () => {
+        const contextOnboarding = setupAndCreateContextForUser('newUser', { url: '/some-page' })
+        const props = await createServerSideProps(contextOnboarding, [], {
+          redirectRouteForLoggedOutUsers: '/some-page',
+        })
+
+        expect('redirect' in props).toBeFalsy()
+      })
+    })
+
+    describe('new users', () => {
+      const testData: RedirectTestData[] = [
+        {
+          userType: 'loggedIn',
+          expectedRedirect: false,
+        },
+        {
+          userType: 'newUser',
+          expectedRedirect: true,
+        },
+        {
+          userType: 'guest',
+          expectedRedirect: false,
+        },
+        {
+          userType: 'bot',
+          expectedRedirect: false,
+        },
+      ]
+      it.each(testData)(
+        'should correctly handle redirect for new users if user is of type $userType',
+        async ({ userType, expectedRedirect }) => {
+          const context = setupAndCreateContextForUser(userType)
+          const props = await createServerSideProps(context, [], {
+            redirectRouteForNewUsers: '/some-page',
+          })
+
+          if (expectedRedirect) {
+            expect(props).toEqual({
+              redirect: {
+                destination: '/some-page',
+                permanent: false,
+              },
+            })
+          } else {
+            expect('redirect' in props).toBeFalsy()
+          }
+        }
+      )
+
+      it('should not redirect to specified page if already there', async () => {
+        const contextOnboarding = setupAndCreateContextForUser('newUser', { url: '/some-page' })
+        const props = await createServerSideProps(contextOnboarding, [], {
+          redirectRouteForNewUsers: '/some-page',
+        })
+
+        expect('redirect' in props).toBeFalsy()
+      })
     })
   })
 
-  it('should not redirect on valid UUID params', async () => {
-    const param1 = createUUID()
-    const param2 = createUUID()
-    const url = `/path/${param1}/${param2}`
-    const customProps = { uuidParams: [param1, param2] }
+  describe('createServerSidePropsWithLoggedInUserGuard', () => {
+    it('should redirect to home if user is logged in', async () => {
+      const context = setupAndCreateContextForUser('loggedIn')
+      const props = await createServerSidePropsWithLoggedInUserGuard(context)
 
-    // @ts-ignore
-    const props = await createServerSideProps({ req: { url } }, [query1], customProps)
+      expect(props).toEqual({
+        redirect: {
+          destination: '/',
+          permanent: false,
+        },
+      })
+    })
 
-    expect(mockQueryFunction).toHaveBeenCalledWith(query1)
-    expect(props).toEqual({
-      props: {
-        ...expectedProps,
-        customProps,
-      },
+    it('should not redirect to home if user is not logged in', async () => {
+      const props = await createServerSidePropsWithLoggedInUserGuard(context)
+
+      expect(props).toEqual(
+        expectedProps.with({
+          customProps: {
+            redirectRouteForLoggedInUsers: '/',
+          },
+        })
+      )
     })
   })
 })
diff --git a/apps/web/helpers/createServerSideProps.ts b/apps/web/helpers/createServerSideProps.ts
index feb5c2f1a8209736c08a469738a7722967083972..e2de728daba9b1c6d906ae53aaef9fdefee173ca 100644
--- a/apps/web/helpers/createServerSideProps.ts
+++ b/apps/web/helpers/createServerSideProps.ts
@@ -1,5 +1,5 @@
 import type { QueryOptions } from '@apollo/client'
-import type { GetServerSidePropsResult, NextPageContext } from 'next'
+import type { GetServerSidePropsContext, GetServerSidePropsResult } from 'next'
 
 import { initializeWebApolloClient } from '@holi/api/graphql/client'
 import { authenticatedUserV2Query } from '@holi/core/domain/shared/queries'
@@ -9,25 +9,42 @@ import { createTranslationPageProps } from '@holi/web/helpers/createTranslationP
 import { getOrigin } from '@holi/web/helpers/getOrigin'
 import { getValidLocale } from '@holi/web/helpers/getValidLocale'
 import { createApolloPageProps } from '@holi/web/helpers/useApolloWebClient'
-import { type CustomProps, HoliPageProps, type NextJSPageProps } from '@holi/web/types'
+import { type CustomProps, HoliPageProps, type NextJSPageProps, type UserPageProps } from '@holi/web/types'
 import { coerceUUIDParams } from '@holi/web/helpers/coerceUUIDParams'
+import { GUEST_MODE_COOKIE_NAME } from '@holi/core/screens/onboarding/helpers/guestModeStorage.web'
+import { isAccountComplete } from '@holi/core/screens/onboarding/helpers/isAccountComplete'
+import type { User } from '@holi/core/domain/shared/types'
+import type { NextApiRequestCookies } from 'next/dist/server/api-utils'
 
 interface SkippableQueryOptions extends QueryOptions {
   skip?: boolean
 }
 
-const createUserPageProps = (userId?: string) => {
-  if (userId) {
+type PageContextRequest = GetServerSidePropsContext['req']
+
+// List of user agents substrings used by search engine crawlers and link preview bots (python-requests is used by Okuna)
+const botUserAgents = ['bot', 'crawl', 'slurp', 'spider', 'facebookexternalhit', 'whatsapp', 'python-requests']
+const isBot = (headers: PageContextRequest['headers'] = {}) =>
+  botUserAgents.some((userAgent) => headers['user-agent']?.toLowerCase().includes(userAgent))
+
+const isGuestUser = (cookies: NextApiRequestCookies = {}) => !!cookies[GUEST_MODE_COOKIE_NAME]
+
+const createUserPageProps = (user: User | undefined, req: PageContextRequest): UserPageProps => {
+  if (user?.id) {
     return {
-      id: userId,
+      id: user.id,
       isLoggedOut: false,
+      accountCompleted: isAccountComplete(user),
     }
   }
-  return { isLoggedOut: true }
+  return {
+    isLoggedOut: true,
+    guestMode: isGuestUser(req?.cookies) || isBot(req?.headers),
+  }
 }
 
 export const createServerSideProps = async (
-  { req, locale: nextJsLocale }: NextPageContext,
+  { req, locale: nextJsLocale }: GetServerSidePropsContext,
   queries: SkippableQueryOptions[] = [],
   customProps?: Partial<CustomProps>
 ): Promise<GetServerSidePropsResult<Partial<NextJSPageProps>>> => {
@@ -80,30 +97,45 @@ export const createServerSideProps = async (
   // Ignore failing user request silently
   const userQueryResult = await authenticatedUserPromise.catch()
   const userId = userQueryResult.data?.authenticatedUserV2?.id
+  const user = createUserPageProps(userQueryResult.data?.authenticatedUserV2, req)
+
+  const redirectDestination = handleOnboardingStateDependentRedirect(user, customProps)
+
+  if (redirectDestination && req.url !== redirectDestination) {
+    return {
+      redirect: {
+        destination: redirectDestination,
+        permanent: false,
+      },
+    }
+  }
 
   return minimalProps.with({
     translations: await createTranslationPageProps(locale),
     posthogBootstrapValues: await createPosthogPageProps(userId),
     apolloState: createApolloPageProps(client),
-    user: createUserPageProps(userId),
+    user,
   })
 }
 
-export const createServerSidePropsWithLoggedInUserGuard: typeof createServerSideProps = async (...args) => {
-  const result = await createServerSideProps(...args)
-
-  if ('props' in result) {
-    const props = await Promise.resolve(result.props)
-
-    if (props.__USER__?.id) {
-      return {
-        redirect: {
-          destination: '/',
-          permanent: false,
-        },
-      }
-    }
+const handleOnboardingStateDependentRedirect = (user: UserPageProps, customProps?: Partial<CustomProps>) => {
+  if (!user.isLoggedOut && !user.accountCompleted) {
+    return '/onboarding'
   }
-
-  return result
+  if (customProps?.redirectRouteForLoggedInUsers && !user.isLoggedOut) {
+    return customProps.redirectRouteForLoggedInUsers
+  }
+  if (customProps?.redirectRouteForNewUsers && user.isLoggedOut && !user.guestMode) {
+    return customProps.redirectRouteForNewUsers
+  }
+  if (customProps?.redirectRouteForLoggedOutUsers && user.isLoggedOut) {
+    return customProps.redirectRouteForLoggedOutUsers
+  }
+  return undefined
 }
+
+export const createServerSidePropsWithLoggedInUserGuard: typeof createServerSideProps = (
+  context,
+  queries,
+  customProps
+) => createServerSideProps(context, queries, { ...customProps, redirectRouteForLoggedInUsers: '/' })
diff --git a/apps/web/pages/apps/challenges.tsx b/apps/web/pages/apps/challenges.tsx
index cf3c10d2a0685078b8e87ac58896c449cce34f9e..28dd09555a8bf05441e4c1797827bb370f577a3c 100644
--- a/apps/web/pages/apps/challenges.tsx
+++ b/apps/web/pages/apps/challenges.tsx
@@ -1,4 +1,4 @@
-import { NextPage, NextPageContext } from 'next'
+import type { NextPage, GetServerSidePropsContext } from 'next'
 import React from 'react'
 
 import { createExternalChallengesPath } from '@holi-apps/challenges/helpers/navigation'
@@ -13,7 +13,7 @@ const getSinglePath = (path: string | string[] | undefined) => {
   return path
 }
 
-export const getServerSideProps = async (context: NextPageContext) => {
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const { path } = context.query
   const singlePath = getSinglePath(path)
 
diff --git a/apps/web/pages/donations/[projectId].tsx b/apps/web/pages/donations/[projectId].tsx
index fe3a3928c5ec219c86a1e381c2754ea9e0e7b578..53925ffdda2e8e3e44ff06f619beb1904a2497a9 100644
--- a/apps/web/pages/donations/[projectId].tsx
+++ b/apps/web/pages/donations/[projectId].tsx
@@ -1,5 +1,5 @@
-import { NextPageContext } from 'next'
-import React, { ReactElement } from 'react'
+import type { GetServerSidePropsContext } from 'next'
+import React, { type ReactElement } from 'react'
 
 import { createServerSideProps } from '@holi/web/helpers/createServerSideProps'
 import { AppLayout } from '@holi/web/layout/NavigationLayoutDonationsApp'
@@ -12,7 +12,7 @@ const DonationsAppProjectDetailPage: NextPageWithLayout = () => <DonationsAppPro
 
 DonationsAppProjectDetailPage.getLayout = (page: ReactElement) => <AppLayout>{page}</AppLayout>
 
-export const getServerSideProps = async (context: NextPageContext) => {
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const { projectId } = context.query
 
   const queries = [
diff --git a/apps/web/pages/donations/index.tsx b/apps/web/pages/donations/index.tsx
index b1f6694946a4d460ace8fd52e4f26ad26d84a26a..b38b6998dfa1ff9387984e472861a2c3badb2943 100644
--- a/apps/web/pages/donations/index.tsx
+++ b/apps/web/pages/donations/index.tsx
@@ -1,5 +1,5 @@
-import { NextPageContext } from 'next'
-import React, { ReactElement } from 'react'
+import type { GetServerSidePropsContext } from 'next'
+import React, { type ReactElement } from 'react'
 
 import { createServerSideProps } from '@holi/web/helpers/createServerSideProps'
 import { AppLayout } from '@holi/web/layout/NavigationLayoutDonationsApp'
@@ -16,7 +16,7 @@ export const paths = {
   de: '/spenden',
 }
 
-export const getServerSideProps = async (context: NextPageContext) =>
+export const getServerSideProps = async (context: GetServerSidePropsContext) =>
   createServerSideProps(context, [], {
     seoTitle: 'seo.h1.donations',
     urls: paths,
diff --git a/apps/web/pages/feed-posts/[idOrSlug]/index.tsx b/apps/web/pages/feed-posts/[idOrSlug]/index.tsx
index a857b7904f45a32b70e648793afdb7b562f32249..8850062b4c5cd8ad1a323242a60e7e05888641a2 100644
--- a/apps/web/pages/feed-posts/[idOrSlug]/index.tsx
+++ b/apps/web/pages/feed-posts/[idOrSlug]/index.tsx
@@ -1,10 +1,10 @@
-import type { NextPageContext } from 'next'
+import type { GetServerSidePropsContext } from 'next'
 
 import PostDetailsPage from '@holi/core/screens/individualPosts/PostDetailsPage'
 import { postQuery } from '@holi/core/screens/individualPosts/queries'
 import { createServerSideProps } from '@holi/web/helpers/createServerSideProps'
 
-export const getServerSideProps = async (context: NextPageContext) => {
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const { idOrSlug } = context.query
 
   const queries = [
diff --git a/apps/web/pages/index.tsx b/apps/web/pages/index.tsx
index 22861ee7e2da33b0b4f5d21639689de4917f75f3..ea489a3b12f5a2672be5c88c82cb2d7b1c963ed8 100644
--- a/apps/web/pages/index.tsx
+++ b/apps/web/pages/index.tsx
@@ -1,4 +1,4 @@
-import type { NextPage, NextPageContext } from 'next'
+import type { GetServerSidePropsContext, NextPage } from 'next'
 import React from 'react'
 
 import { createServerSideProps } from '@holi/web/helpers/createServerSideProps'
@@ -6,9 +6,10 @@ import HomeFeed from '@holi/core/screens/homeFeed/HomeFeed'
 
 const HomeFeedPage: NextPage = () => <HomeFeed />
 
-export const getServerSideProps = async (context: NextPageContext) =>
+export const getServerSideProps = async (context: GetServerSidePropsContext) =>
   createServerSideProps(context, [], {
     seoTitle: 'seo.h1.home',
+    redirectRouteForNewUsers: '/onboarding',
   })
 
 export default HomeFeedPage
diff --git a/apps/web/pages/insights/[insightId]/discussions/[discussionId]/index.tsx b/apps/web/pages/insights/[insightId]/discussions/[discussionId]/index.tsx
index 259cb3bd2ab91c1e2465013f2f852089c2abd2fd..d6f785856892caebdf4dce3d73e269c3009ffc60 100644
--- a/apps/web/pages/insights/[insightId]/discussions/[discussionId]/index.tsx
+++ b/apps/web/pages/insights/[insightId]/discussions/[discussionId]/index.tsx
@@ -1,4 +1,4 @@
-import { NextPageContext } from 'next'
+import type { GetServerSidePropsContext } from 'next'
 import React from 'react'
 
 import DiscussionDetailPage from '@holi/core/screens/insights/discussions/DiscussionDetailPage'
@@ -7,7 +7,7 @@ import { createServerSideProps } from '@holi/web/helpers/createServerSideProps'
 
 const DiscussionPage = () => <DiscussionDetailPage />
 
-export const getServerSideProps = async (context: NextPageContext) => {
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const { discussionId } = context.query
 
   const queries = [
diff --git a/apps/web/pages/insights/[insightId]/index.tsx b/apps/web/pages/insights/[insightId]/index.tsx
index a43688db98212b373833fc6803b0745b941af6ab..5aea9d17597d5e20d7201801b2cd60584233fd8b 100644
--- a/apps/web/pages/insights/[insightId]/index.tsx
+++ b/apps/web/pages/insights/[insightId]/index.tsx
@@ -1,4 +1,4 @@
-import type { NextPage, NextPageContext } from 'next'
+import type { NextPage, GetServerSidePropsContext } from 'next'
 import React from 'react'
 
 import InsightDetailPage from '@holi/core/screens/insights/InsightDetailPage'
@@ -7,7 +7,7 @@ import { createServerSideProps } from '@holi/web/helpers/createServerSideProps'
 
 const InsightPage: NextPage = () => <InsightDetailPage />
 
-export const getServerSideProps = async (context: NextPageContext) => {
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const { insightId } = context.query
 
   const queries = [
diff --git a/apps/web/pages/insights/[insightId]/initiatives/[initiativeId]/index.tsx b/apps/web/pages/insights/[insightId]/initiatives/[initiativeId]/index.tsx
index ff8c8fa73bb81f116441dbf5bd5aad05c23bfd18..b24fcec676cb21860805fcae886bf3143c17cee7 100644
--- a/apps/web/pages/insights/[insightId]/initiatives/[initiativeId]/index.tsx
+++ b/apps/web/pages/insights/[insightId]/initiatives/[initiativeId]/index.tsx
@@ -1,4 +1,4 @@
-import type { NextPageContext } from 'next'
+import type { GetServerSidePropsContext } from 'next'
 import React from 'react'
 
 import InitiativeDetailPage from '@holi/core/screens/insights/initiatives/InitiativeDetailPage'
@@ -7,7 +7,7 @@ import { createServerSideProps } from '@holi/web/helpers/createServerSideProps'
 
 const InitiativePage = () => <InitiativeDetailPage />
 
-export const getServerSideProps = async (context: NextPageContext) => {
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const { insightId, initiativeId } = context.query
 
   const queries = [
diff --git a/apps/web/pages/insights/[insightId]/quotes/[quoteId]/index.tsx b/apps/web/pages/insights/[insightId]/quotes/[quoteId]/index.tsx
index 25ced24436eb22e5f8185a98ecda3014fbac3d20..cd90fe6fab96e29e58e3eee7b278b48e35c95e19 100644
--- a/apps/web/pages/insights/[insightId]/quotes/[quoteId]/index.tsx
+++ b/apps/web/pages/insights/[insightId]/quotes/[quoteId]/index.tsx
@@ -1,4 +1,4 @@
-import { NextPage, NextPageContext } from 'next'
+import type { NextPage, GetServerSidePropsContext } from 'next'
 import React from 'react'
 
 import { insightWithQuoteById } from '@holi/core/screens/insights/queries'
@@ -7,7 +7,7 @@ import { createServerSideProps } from '@holi/web/helpers/createServerSideProps'
 
 const InsightQuotePage: NextPage = () => <QuoteDetailPage />
 
-export const getServerSideProps = async (context: NextPageContext) => {
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const { insightId, quoteId } = context.query
 
   const queries = [
diff --git a/apps/web/pages/insights/[insightId]/recommendations/[recommendationId]/index.tsx b/apps/web/pages/insights/[insightId]/recommendations/[recommendationId]/index.tsx
index 7c553e1f442d309872f00ccdbf148b48621dc792..86da472fcc1ac1d0d54c309ced0f8911865f3ac6 100644
--- a/apps/web/pages/insights/[insightId]/recommendations/[recommendationId]/index.tsx
+++ b/apps/web/pages/insights/[insightId]/recommendations/[recommendationId]/index.tsx
@@ -1,4 +1,4 @@
-import type { NextPageContext } from 'next'
+import type { GetServerSidePropsContext } from 'next'
 import React from 'react'
 
 import { insightWithRecommendation } from '@holi/core/screens/insights/queries'
@@ -7,7 +7,7 @@ import { createServerSideProps } from '@holi/web/helpers/createServerSideProps'
 
 const RecommendationPage = () => <RecommendationDetailPage />
 
-export const getServerSideProps = async (context: NextPageContext) => {
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const { insightId, recommendationId } = context.query
 
   const queries = [
diff --git a/apps/web/pages/onboarding/index.tsx b/apps/web/pages/onboarding/index.tsx
index d485dcbba51e233bbf9ab1c6c5fc586de6dbb8bc..28a0d5d4fa80f71d78ff462b1e8b09f5ae02b496 100644
--- a/apps/web/pages/onboarding/index.tsx
+++ b/apps/web/pages/onboarding/index.tsx
@@ -1,8 +1,14 @@
-import type { NextPage } from 'next'
+import type { NextPage, GetServerSidePropsContext } from 'next'
 import React from 'react'
 
 import Onboarding from '@holi/core/screens/onboarding/Onboarding'
+import { createServerSideProps } from '@holi/web/helpers/createServerSideProps'
 
 const OnboardingPage: NextPage = () => <Onboarding />
 
+export const getServerSideProps = async (context: GetServerSidePropsContext) =>
+  createServerSideProps(context, [], {
+    redirectRouteForLoggedInUsers: '/',
+  })
+
 export default OnboardingPage
diff --git a/apps/web/pages/posts/[postId]/index.tsx b/apps/web/pages/posts/[postId]/index.tsx
index 628824a3a76ff074b0bc8174e322bb5b2b4e0228..37dd2ad40f4034da70d57f0ab489c191ee3dba89 100644
--- a/apps/web/pages/posts/[postId]/index.tsx
+++ b/apps/web/pages/posts/[postId]/index.tsx
@@ -1,4 +1,4 @@
-import { NextPage, NextPageContext } from 'next'
+import type { NextPage, GetServerSidePropsContext } from 'next'
 import React from 'react'
 
 import PostDetailPage from '@holi/core/screens/posts/PostDetailPage'
@@ -7,7 +7,7 @@ import { createServerSideProps } from '@holi/web/helpers/createServerSideProps'
 
 const PostPage: NextPage = () => <PostDetailPage />
 
-export const getServerSideProps = async (context: NextPageContext) => {
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const { postId } = context.query
 
   const queries = [
diff --git a/apps/web/pages/profile/[userId].tsx b/apps/web/pages/profile/[userId].tsx
index 2afad83ed2307f71e49c6d9874228d6f2c60b45c..a50a332d8bc248125aeaa1c9dee27129d6aedb35 100644
--- a/apps/web/pages/profile/[userId].tsx
+++ b/apps/web/pages/profile/[userId].tsx
@@ -1,4 +1,4 @@
-import { NextPage, NextPageContext } from 'next'
+import type { NextPage, GetServerSidePropsContext } from 'next'
 import React from 'react'
 
 import { userByIdQuery } from '@holi/core/domain/shared/queries'
@@ -7,7 +7,7 @@ import { createServerSideProps } from '@holi/web/helpers/createServerSideProps'
 
 const UserProfilePage: NextPage = () => <UserProfile />
 
-export const getServerSideProps = async (context: NextPageContext) => {
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const { userId } = context.query
 
   const queries = [
diff --git a/apps/web/pages/sitemap.xml.ts b/apps/web/pages/sitemap.xml.ts
index 861aed959de8a4d9965929ba25e3b8b320c4ed4b..321b6f80743b9ff8be30551c4ea92b602e44808a 100644
--- a/apps/web/pages/sitemap.xml.ts
+++ b/apps/web/pages/sitemap.xml.ts
@@ -1,4 +1,4 @@
-import type { NextPageContext } from 'next'
+import type { GetServerSidePropsContext } from 'next'
 
 import { locales } from '@holi/core/i18n/locales.cjs'
 import { getOrigin } from '@holi/web/helpers/getOrigin'
@@ -10,11 +10,11 @@ const SiteMap = () => {
 
 const sitemapIndexUrls = ['/sitemap/static', '/sitemap/insights']
 
-export const getServerSideProps = async ({ req, res }: NextPageContext) => {
+export const getServerSideProps = async ({ req, res }: GetServerSidePropsContext) => {
   const origin = getOrigin(req)
   const sitemap = generateSitemapIndex(
     origin,
-    locales.map((locale) => sitemapIndexUrls.map((url) => `/${locale}${url}`)).flat()
+    locales.flatMap((locale) => sitemapIndexUrls.map((url) => `/${locale}${url}`))
   )
 
   if (res) {
diff --git a/apps/web/pages/sitemap/insights.xml.ts b/apps/web/pages/sitemap/insights.xml.ts
index 82f8b55fe80553d7d8d4ca93bb3e7121482fe7e7..22b5631a7dae2dd243226d394c0fc4f410296b22 100644
--- a/apps/web/pages/sitemap/insights.xml.ts
+++ b/apps/web/pages/sitemap/insights.xml.ts
@@ -1,5 +1,5 @@
 import { gql } from '@apollo/client/core'
-import type { NextPageContext } from 'next'
+import type { GetServerSidePropsContext } from 'next'
 import pino from 'pino'
 
 import { initializeWebApolloClient } from '@holi/api/graphql/client'
@@ -29,7 +29,7 @@ const InsightsSiteMapIndex = () => {
   // Content is written to response in getServerSideProps
 }
 
-export const getServerSideProps = async ({ req, res, locale }: NextPageContext) => {
+export const getServerSideProps = async ({ req, res, locale }: GetServerSidePropsContext) => {
   const prefix = getUrlPrefix(req, locale)
   const client = initializeWebApolloClient({ locale })
   const totalInsightsCount = await client
diff --git a/apps/web/pages/sitemap/insights/[page].ts b/apps/web/pages/sitemap/insights/[page].ts
index ffccabf17575b9b2fc63267464d5aff6eb8aa8f6..7dce2fa26300a89b1dc0895177fb8e5972b7cb37 100644
--- a/apps/web/pages/sitemap/insights/[page].ts
+++ b/apps/web/pages/sitemap/insights/[page].ts
@@ -1,9 +1,9 @@
 import { gql } from '@apollo/client/core'
-import type { NextPageContext } from 'next'
+import type { GetServerSidePropsContext } from 'next'
 import pino from 'pino'
 
 import { initializeWebApolloClient } from '@holi/api/graphql/client'
-import { Insight } from '@holi/api/graphql/graphql-codegen'
+import type { Insight } from '@holi/api/graphql/graphql-codegen'
 import { generateSitemapUrlSet, getUrlPrefix } from '@holi/web/helpers/sitemap'
 import { PAGE_SIZE } from '@holi/web/pages/sitemap/insights.xml'
 
@@ -51,16 +51,16 @@ const asNum = (param: string | string[] | undefined) => {
     return 0
   }
   if (Array.isArray(param)) {
-    return param.length ? parseInt(param[0]) : 0
+    return param.length ? Number.parseInt(param[0]) : 0
   }
-  return parseInt(param)
+  return Number.parseInt(param)
 }
 
 const InsightSiteMap = () => {
   // Content is written to response in getServerSideProps
 }
 
-export const getServerSideProps = async ({ req, res, query, locale }: NextPageContext) => {
+export const getServerSideProps = async ({ req, res, query, locale }: GetServerSidePropsContext) => {
   const { page } = query
   const prefix = getUrlPrefix(req, locale)
   const client = initializeWebApolloClient({ locale })
@@ -77,7 +77,7 @@ export const getServerSideProps = async ({ req, res, query, locale }: NextPageCo
 
   const sitemap = generateSitemapUrlSet(
     prefix,
-    insights.map((insight: Insight) => createEntriesForInsight(insight)).flat()
+    insights.flatMap((insight: Insight) => createEntriesForInsight(insight))
   )
 
   if (res) {
diff --git a/apps/web/pages/sitemap/static.xml.ts b/apps/web/pages/sitemap/static.xml.ts
index ffeac505f88f7466db56ea39a3f0f1f6515c1c62..7469f316f6bb7384d0fbf8e5d9149da169befed3 100644
--- a/apps/web/pages/sitemap/static.xml.ts
+++ b/apps/web/pages/sitemap/static.xml.ts
@@ -1,4 +1,4 @@
-import type { NextPageContext } from 'next'
+import type { GetServerSidePropsContext } from 'next'
 import { defaultLocale } from '@holi/core/i18n/locales.cjs'
 import { generateSitemapUrlSet, getUrlPrefix } from '@holi/web/helpers/sitemap'
 import { paths as donationPaths } from '@holi/web/pages/donations'
@@ -33,7 +33,7 @@ const StaticSitemapIndex = () => {
   // Content is written to response in getServerSideProps
 }
 
-export const getServerSideProps = async ({ req, res, locale }: NextPageContext) => {
+export const getServerSideProps = async ({ req, res, locale }: GetServerSidePropsContext) => {
   const prefix = getUrlPrefix(req, locale)
   const sitemap = generateSitemapUrlSet(prefix, createSitemapUrls(locale))
 
diff --git a/apps/web/pages/spaces/[spaceIdOrName]/appointments/[idOrSlug]/index.tsx b/apps/web/pages/spaces/[spaceIdOrName]/appointments/[idOrSlug]/index.tsx
index a7c4f6539f43c0c86237449d403ca325c6247a1c..52beeb01fd18e0e90732b1c4bb4a9c435fd4d887 100644
--- a/apps/web/pages/spaces/[spaceIdOrName]/appointments/[idOrSlug]/index.tsx
+++ b/apps/web/pages/spaces/[spaceIdOrName]/appointments/[idOrSlug]/index.tsx
@@ -1,4 +1,4 @@
-import { NextPage, NextPageContext } from 'next'
+import type { NextPage, GetServerSidePropsContext } from 'next'
 import React from 'react'
 
 import { appointmentByIdOrSlugQuery } from '@holi/core/screens/appointments/queries'
@@ -7,7 +7,7 @@ import { createServerSideProps } from '@holi/web/helpers/createServerSideProps'
 
 const AppointmentDetailsPage: NextPage = () => <AppointmentDetails />
 
-export const getServerSideProps = async (context: NextPageContext) => {
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const { idOrSlug } = context.query
 
   const queries = [
diff --git a/apps/web/pages/spaces/[spaceIdOrName]/appointments/index.tsx b/apps/web/pages/spaces/[spaceIdOrName]/appointments/index.tsx
index a4e60a75ef1b38f6a1bdae77b1c9c6d53598f6c6..5358c1dea839dea08c02cca0d0e1243ac983909f 100644
--- a/apps/web/pages/spaces/[spaceIdOrName]/appointments/index.tsx
+++ b/apps/web/pages/spaces/[spaceIdOrName]/appointments/index.tsx
@@ -1,4 +1,4 @@
-import { NextPage, NextPageContext } from 'next'
+import type { NextPage, GetServerSidePropsContext } from 'next'
 import React from 'react'
 
 import SpaceAppointments from '@holi/core/screens/spaces/appointments/SpaceAppointments'
@@ -7,7 +7,7 @@ import { createServerSideProps } from '@holi/web/helpers/createServerSideProps'
 
 const SpaceAppointmentsPage: NextPage = () => <SpaceAppointments />
 
-export const getServerSideProps = async (context: NextPageContext) => {
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const { spaceIdOrName } = context.query
 
   const queries = [
diff --git a/apps/web/pages/spaces/[spaceIdOrName]/index.tsx b/apps/web/pages/spaces/[spaceIdOrName]/index.tsx
index 1148b50d6120e688bf876932f7e41c1d597d0924..01552aa47b415b1cf642c83406251dde68c9a0a5 100644
--- a/apps/web/pages/spaces/[spaceIdOrName]/index.tsx
+++ b/apps/web/pages/spaces/[spaceIdOrName]/index.tsx
@@ -1,4 +1,4 @@
-import { NextPage, NextPageContext } from 'next'
+import type { NextPage, GetServerSidePropsContext } from 'next'
 import React from 'react'
 
 import SpaceDetails from '@holi/core/screens/spaces/details/SpaceDetails'
@@ -7,7 +7,7 @@ import { createServerSideProps } from '@holi/web/helpers/createServerSideProps'
 
 const SpaceDetailsPage: NextPage = () => <SpaceDetails />
 
-export const getServerSideProps = async (context: NextPageContext) => {
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const { spaceIdOrName } = context.query
 
   const queries = [
diff --git a/apps/web/pages/spaces/[spaceIdOrName]/relatedSpaces.tsx b/apps/web/pages/spaces/[spaceIdOrName]/relatedSpaces.tsx
index d84b8458461c2a9d4ceb48a3a8c3fe38ccc035b6..8ee5a472a996a3a44a46747203fb2ab52a5af35c 100644
--- a/apps/web/pages/spaces/[spaceIdOrName]/relatedSpaces.tsx
+++ b/apps/web/pages/spaces/[spaceIdOrName]/relatedSpaces.tsx
@@ -1,4 +1,4 @@
-import { NextPage, NextPageContext } from 'next'
+import type { NextPage, GetServerSidePropsContext } from 'next'
 import React from 'react'
 
 import { spaceRelatedSpacesQuery } from '@holi/core/screens/spaces/queries'
@@ -7,7 +7,7 @@ import { createServerSideProps } from '@holi/web/helpers/createServerSideProps'
 
 const RelatedSpacesPage: NextPage = () => <RelatedSpaces />
 
-export const getServerSideProps = async (context: NextPageContext) => {
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const { spaceIdOrName } = context.query
 
   const queries = [
diff --git a/apps/web/pages/spaces/[spaceIdOrName]/tasks/[taskId]/index.tsx b/apps/web/pages/spaces/[spaceIdOrName]/tasks/[taskId]/index.tsx
index 7e4db7d71152dc87f689f154a523761ecc048494..ddaaec328165694e47325d40effbf18305cc3c0e 100644
--- a/apps/web/pages/spaces/[spaceIdOrName]/tasks/[taskId]/index.tsx
+++ b/apps/web/pages/spaces/[spaceIdOrName]/tasks/[taskId]/index.tsx
@@ -1,4 +1,4 @@
-import type { NextPage, NextPageContext } from 'next'
+import type { NextPage, GetServerSidePropsContext } from 'next'
 import React from 'react'
 
 import { taskByIdQuery } from '@holi/core/screens/spaces/details/queries'
@@ -7,7 +7,7 @@ import { createServerSideProps } from '@holi/web/helpers/createServerSideProps'
 
 const TaskDetailsPage: NextPage = () => <TaskDetails />
 
-export const getServerSideProps = async (context: NextPageContext) => {
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const { spaceIdOrName, taskId } = context.query
 
   const queries = [
diff --git a/apps/web/pages/spaces/[spaceIdOrName]/tasks/index.tsx b/apps/web/pages/spaces/[spaceIdOrName]/tasks/index.tsx
index cbe6bc5b4e9384151d95a5d4ffb1d97c885b98a6..9d0268affc8e1bd8086df4e6e70a13a317935198 100644
--- a/apps/web/pages/spaces/[spaceIdOrName]/tasks/index.tsx
+++ b/apps/web/pages/spaces/[spaceIdOrName]/tasks/index.tsx
@@ -1,4 +1,4 @@
-import { NextPage, NextPageContext } from 'next'
+import type { NextPage, GetServerSidePropsContext } from 'next'
 import React from 'react'
 
 import { spaceByIdQuery } from '@holi/core/screens/spaces/queries'
@@ -7,7 +7,7 @@ import { createServerSideProps } from '@holi/web/helpers/createServerSideProps'
 
 const SpaceTasksPage: NextPage = () => <SpaceTasks />
 
-export const getServerSideProps = async (context: NextPageContext) => {
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const { spaceIdOrName } = context.query
 
   const queries = [
diff --git a/apps/web/pages/spaces/filter.tsx b/apps/web/pages/spaces/filter.tsx
index 8f03fa959acd20cb952d9cf4db98bb058fe3d1e4..1cccc3a7bb6595d651f9538193ff1507103018fe 100644
--- a/apps/web/pages/spaces/filter.tsx
+++ b/apps/web/pages/spaces/filter.tsx
@@ -1,4 +1,4 @@
-import { NextPage, NextPageContext } from 'next'
+import type { GetServerSidePropsContext, NextPage } from 'next'
 import React from 'react'
 
 import FilteredSpaces from '@holi/core/screens/spaces/filter/FilteredSpaces'
@@ -6,7 +6,7 @@ import { createServerSideProps } from '@holi/web/helpers/createServerSideProps'
 
 const FilteredSpacesPage: NextPage = () => <FilteredSpaces />
 
-export const getServerSideProps = async (context: NextPageContext) =>
+export const getServerSideProps = async (context: GetServerSidePropsContext) =>
   createServerSideProps(context, [], { seoTitle: 'seo.h1.spaces' })
 
 export default FilteredSpacesPage
diff --git a/apps/web/pages/spaces/index.tsx b/apps/web/pages/spaces/index.tsx
index f83b9c5d3e7fe7f330b39c47f43f2b74a44f606a..333777a312ea9e9aac70007a2ad99155553534ea 100644
--- a/apps/web/pages/spaces/index.tsx
+++ b/apps/web/pages/spaces/index.tsx
@@ -1,4 +1,4 @@
-import { NextPage, NextPageContext } from 'next'
+import type { NextPage, GetServerSidePropsContext } from 'next'
 import React from 'react'
 
 import Spaces from '@holi/core/screens/spaces/discover/Spaces'
@@ -6,7 +6,7 @@ import { createServerSideProps } from '@holi/web/helpers/createServerSideProps'
 
 const SpacesPage: NextPage = () => <Spaces />
 
-export const getServerSideProps = async (context: NextPageContext) =>
+export const getServerSideProps = async (context: GetServerSidePropsContext) =>
   createServerSideProps(context, [], { seoTitle: 'seo.h1.spaces' })
 
 export default SpacesPage
diff --git a/apps/web/pages/video-call/[roomName].tsx b/apps/web/pages/video-call/[roomName].tsx
index 9bd0065b31f89c6a9f78e54190467aac31d35c12..440608cbc05edd07b0c409e8e4e0c91430a51116 100644
--- a/apps/web/pages/video-call/[roomName].tsx
+++ b/apps/web/pages/video-call/[roomName].tsx
@@ -1,4 +1,4 @@
-import { NextPage, NextPageContext } from 'next'
+import type { NextPage, GetServerSidePropsContext } from 'next'
 import React from 'react'
 
 import VideoCall from '@holi/core/screens/videoCall/VideoCall'
@@ -6,7 +6,7 @@ import { getOrigin } from '@holi/web/helpers/getOrigin'
 
 const VideoCallPage: NextPage = () => <VideoCall />
 
-export const getServerSideProps = async (context: NextPageContext) => {
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const { roomName } = context.query
   const origin = getOrigin(context.req)
 
diff --git a/apps/web/pages/volunteering/[engagementId].tsx b/apps/web/pages/volunteering/[engagementId].tsx
index 18754eb72d9066f73b9a89888440121c1a451762..1f64afc826f6b876302d93b44eb5cb181fcc4995 100644
--- a/apps/web/pages/volunteering/[engagementId].tsx
+++ b/apps/web/pages/volunteering/[engagementId].tsx
@@ -1,5 +1,5 @@
-import type { NextPageContext } from 'next'
-import React, { ReactElement } from 'react'
+import type { GetServerSidePropsContext } from 'next'
+import React, { type ReactElement } from 'react'
 
 import { createServerSideProps } from '@holi/web/helpers/createServerSideProps'
 import { AppLayout } from '@holi/web/layout/NavigationLayoutVolunteeringApp'
@@ -12,7 +12,7 @@ const VolunteeringEngagementDetailPage: NextPageWithLayout = () => <Volunteering
 
 VolunteeringEngagementDetailPage.getLayout = (page: ReactElement) => <AppLayout>{page}</AppLayout>
 
-export const getServerSideProps = async (context: NextPageContext) => {
+export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const { engagementId } = context.query
 
   const queries = [
diff --git a/apps/web/pages/volunteering/index.tsx b/apps/web/pages/volunteering/index.tsx
index 0239b096a51af89e24a79e0bc799124826230dbd..148e2ecdfc92fa49877d26ebc8ec799dd2d36323 100644
--- a/apps/web/pages/volunteering/index.tsx
+++ b/apps/web/pages/volunteering/index.tsx
@@ -1,5 +1,5 @@
-import { NextPageContext } from 'next'
-import React, { ReactElement } from 'react'
+import type { GetServerSidePropsContext } from 'next'
+import React, { type ReactElement } from 'react'
 
 import { createServerSideProps } from '@holi/web/helpers/createServerSideProps'
 import { AppLayout } from '@holi/web/layout/NavigationLayoutVolunteeringApp'
@@ -16,7 +16,7 @@ export const paths = {
   de: '/ehrenamt',
 }
 
-export const getServerSideProps = async (context: NextPageContext) =>
+export const getServerSideProps = async (context: GetServerSidePropsContext) =>
   createServerSideProps(context, [], {
     seoTitle: 'seo.h1.volunteering',
     urls: paths,
diff --git a/apps/web/providers/WebRootProvider.tsx b/apps/web/providers/WebRootProvider.tsx
index 1892ad884a5b68432a4889e751cff03516269d60..1809046024079b9a740dbc4a8145e7810ff57349 100644
--- a/apps/web/providers/WebRootProvider.tsx
+++ b/apps/web/providers/WebRootProvider.tsx
@@ -8,6 +8,7 @@ import defaultHoliTheme, { ThemeProvider } from '@holi/ui/styles/theme'
 import { useApolloWebClient } from '@holi/web/helpers/useApolloWebClient'
 import type { HoliPageProps } from '@holi/web/types'
 import { WebRouteHistoryInitializer } from '@holi/web/providers/WebRouteHistoryInitializer'
+import OnboardingInitializer from '@holi/core/screens/onboarding/OnboardingInitializer'
 interface RootProviderProps {
   pageProps: HoliPageProps
 }
@@ -23,6 +24,7 @@ const WebRootProvider = ({ children, pageProps }: PropsWithChildren<RootProvider
       <ThemeProvider theme={defaultHoliTheme}>
         <RootProvider apolloClient={apolloClient} posthogBootstrapState={pageProps.posthogBootstrapValues}>
           <WebRouteHistoryInitializer />
+          <OnboardingInitializer />
           {children}
         </RootProvider>
       </ThemeProvider>
diff --git a/apps/web/public/documents/privacyPolicy_de.html b/apps/web/public/documents/privacyPolicy_de.html
index d1e2b945e7036c098d2cca3e9fc9ff9f034f9dd8..c957bd0ce949f2a78e8237d8c33ae46f4e7940ec 100644
--- a/apps/web/public/documents/privacyPolicy_de.html
+++ b/apps/web/public/documents/privacyPolicy_de.html
@@ -475,11 +475,6 @@
           Speicherdauer ist unbegrenzt, aber die Daten werden beim Abschluss des Onboardings entfernt (d.h. entweder bei
           der Anlage des Accounts oder beim “Umsehen als Gast”).</p>
       </li>
-      <li>
-        <p>&bdquo;guest_mode&ldquo; (unbegrenzt): Speichern der Information, ob Nutzende ohne Account die n&ouml;tigen
-          Erstinformationen zur Nutzung der Plattform bereits gesehen haben oder sie angezeigt werden sollten. Die
-          Speicherdauer ist unbegrenzt, aber die Daten werden bei Login oder Anlage eines Accounts entfernt.</p>
-      </li>
       <li>
         <p>&bdquo;space_join_is_onboarded&rdquo; (unbegrenzt): Speichern der Information, ob Nutzende die n&ouml;tigen
           Erstinformationen zur Nutzung von Spaces bereits gesehen haben oder sie angezeigt werden sollten.</p>
@@ -675,6 +670,11 @@
       <li>
         <p>&bdquo;fr&quot;(90 Tage): Ausspielen von Werbeanzeigen, Nutzungsanalyse und Conversion-Tracking.</p>
       </li>
+      <li>
+        <p>&bdquo;guest_mode&ldquo; (1 Jahr): Speichern der Information, ob Nutzende ohne Account die n&ouml;tigen
+          Erstinformationen zur Nutzung der Plattform bereits gesehen haben oder sie angezeigt werden sollten. Die
+          Speicherdauer beträgt ein Jahr, aber wird bei Login oder Anlage eines Accounts entfernt.</p>
+      </li>
     </ul>
   </li>
   <li>
diff --git a/apps/web/public/documents/privacyPolicy_en.html b/apps/web/public/documents/privacyPolicy_en.html
index 65f469872635e6d7680b8094c3888da880fc08e3..373f5b66104bd66d6249195ab37278109efc4832 100644
--- a/apps/web/public/documents/privacyPolicy_en.html
+++ b/apps/web/public/documents/privacyPolicy_en.html
@@ -446,11 +446,6 @@
           indefinitely, but is removed at the end of the onboarding (i.e. either when the user created an account or
           “continued as guest”).</p>
       </li>
-      <li>
-        <p>&lsquo;guest_mode&rsquo; (unlimited): Saves the information as to whether users without account have already
-          seen the initial information required to use the platform or whether it should be displayed. It is stored
-          indefinitely, but is removed when the user logs in or creates an account.</p>
-      </li>
       <li>
         <p>&lsquo;space_join_is_onboarded&rsquo; (unlimited): Saves the information as to whether users have already
           seen the initial information required to use Spaces or whether it should be displayed.</p>
@@ -641,7 +636,11 @@
       <li>
         <p>&lsquo;fr&rsquo; (90 days): Serving ads, usage analysis and conversion tracking.</p>
       </li>
-
+      <li>
+        <p>&lsquo;guest_mode&rsquo; (1 year): Saves the information as to whether users without account have already
+          seen the initial information required to use the platform or whether it should be displayed. It is stored
+          for one year, but is removed when the user logs in or creates an account.</p>
+      </li>
     </ul>
   </li>
 </ul>
diff --git a/apps/web/types.ts b/apps/web/types.ts
index ca368c82ee8132ef814f7e45bbe56bc7edd51507..c8c0854a256fc03e381589689d0dafc02bcd4ab3 100644
--- a/apps/web/types.ts
+++ b/apps/web/types.ts
@@ -10,12 +10,23 @@ export interface CustomProps {
   seoTitle?: string
   urls?: SeoUrls
   blockIndexing?: boolean
+  /** Name of path patameters that are expected to be UUIDs. Will try to correct invalid UUIDs (and redirect accordingly) if possible. */
   uuidParams?: (string | string[] | undefined)[]
+  /** Prevents logged in users from seeing the page but redirecting them instead to the specified route. Useful e.g. for login or onboarding screens. */
+  redirectRouteForLoggedInUsers?: string
+  /** Prevents logged out users from seeing the page but redirecting them instead to the specified route. Might be used for screens that should not be visible to logged out users. */
+  redirectRouteForLoggedOutUsers?: string
+  /** Prevents users, that never visited holi before, from seeing the page but redirecting theminstead to the specified route (this excludes guest users). Useful e.g. to enforce onboarding. */
+  redirectRouteForNewUsers?: string
 }
 
 export interface UserPageProps {
   id?: string
   isLoggedOut: boolean
+  /** User chose "continue as guest" (or is a bot) */
+  guestMode?: boolean
+  /** User is logged in but the account is not complete yet */
+  accountCompleted?: boolean
 }
 
 export interface NextJSPageProps extends Ni18nServerState, Record<string, unknown> {
diff --git a/core/auth/screens/Login.tsx b/core/auth/screens/Login.tsx
index 6ba13ef6b6be3b1763d0fb1c2a2b8830b5ec18b4..23faf09870b613ab68a90de56eaf107a0d881536 100644
--- a/core/auth/screens/Login.tsx
+++ b/core/auth/screens/Login.tsx
@@ -28,7 +28,7 @@ import HoliLoader, { useLoader } from '@holi/ui/components/molecules/HoliLoader'
 import { Screen } from '@holi/core/components/Screen'
 import { useRedirect } from '@holi/core/navigation/hooks/useRedirect'
 import HoliContainer from '@holi/ui/components/atoms/HoliContainer'
-import { clearGuestMode } from '@holi/core/screens/onboarding/helpers/guestModeAsyncStore'
+import { clearGuestMode } from '@holi/core/screens/onboarding/helpers/guestModeStorage'
 
 const Login = () => {
   const { isLoggedOut } = useLoginState()
diff --git a/core/helpers/logging/constants.ts b/core/helpers/logging/constants.ts
index 008658f1b09ec7ff8db59c83afcae640068a0810..a4c3476988d7a4b59cb7afddf672b27abc4bf500 100644
--- a/core/helpers/logging/constants.ts
+++ b/core/helpers/logging/constants.ts
@@ -11,6 +11,7 @@ export const DEBUG_LOG_COMPONENTS = {
   Notifications: false,
   Tracking: false,
   Other: false,
+  RandomizationState: false,
 }
 
 export const IS_IN_TESTING_ENV = process.env.JEST_WORKER_ID !== undefined
diff --git a/core/providers/RootProvider.tsx b/core/providers/RootProvider.tsx
index 7360b8b6c401fec0eb542147d343c433b018c44f..6a2a47917867c9b9557224c725117fa0318d74a8 100644
--- a/core/providers/RootProvider.tsx
+++ b/core/providers/RootProvider.tsx
@@ -15,7 +15,6 @@ import PortalProvider from '@holi/core/providers/PortalProvider'
 import SignupModalProvider from '@holi/core/providers/SignupModalProvider'
 import { RefreshContextProvider } from '@holi/core/refreshing/providers/RefreshContextProvider'
 import DeviceRegistration from '@holi/core/screens/notifications/components/DeviceRegistration'
-import OnboardingInitializer from '@holi/core/screens/onboarding/OnboardingInitializer'
 import PosthogProvider, { type PosthogProviderProps } from '@holi/core/tracking/PosthogProvider'
 import TrackingInitializer from '@holi/core/tracking/TrackingInitializer'
 import { ToastProvider } from '@holi/ui/components/molecules/HoliToastProvider'
@@ -46,7 +45,6 @@ const RootProvider = ({ apolloClient, posthogBootstrapState, children }: PropsWi
                 <SessionExpiryProtection>
                   <RefreshContextProvider>
                     <FeatureFlagsFetcher />
-                    <OnboardingInitializer />
                     <OnboardingFinishModal />
                     {isMobile ? <DeviceRegistration /> : null}
                     {isMobile ? <UpdateAppModal /> : null}
diff --git a/core/screens/onboarding/__tests__/OnboardingInitializer.test.tsx b/core/screens/onboarding/__tests__/OnboardingInitializer.test.tsx
index 209fc703d5fe2e3598c516f6acbc3d6006413a04..fdfba73a17336df27563319f9f20c98ad52995cf 100644
--- a/core/screens/onboarding/__tests__/OnboardingInitializer.test.tsx
+++ b/core/screens/onboarding/__tests__/OnboardingInitializer.test.tsx
@@ -11,6 +11,11 @@ jest.mock('@holi/core/screens/onboarding/hooks/onboardingState', () => ({
 }))
 
 describe('OnboardingInitializer', () => {
+  beforeEach(() => {
+    mockUseOnboardingInitialization.mockReturnValue({ isLoading: false })
+    mockUseOnboardingRedirect.mockReturnValue({ showOnboardingOnStartup: false })
+  })
+
   it('should initialize onboarding', () => {
     render(<OnboardingInitializer />)
 
diff --git a/core/screens/onboarding/helpers/__tests__/guestModeAsyncStore.test.ts b/core/screens/onboarding/helpers/__tests__/guestModeStorage.test.ts
similarity index 91%
rename from core/screens/onboarding/helpers/__tests__/guestModeAsyncStore.test.ts
rename to core/screens/onboarding/helpers/__tests__/guestModeStorage.test.ts
index fad15bf8aba1203ccb239ff14bc556e0a8fb1294..a4d72f02911e3372c8a67484aed577906c50c266 100644
--- a/core/screens/onboarding/helpers/__tests__/guestModeAsyncStore.test.ts
+++ b/core/screens/onboarding/helpers/__tests__/guestModeStorage.test.ts
@@ -1,4 +1,4 @@
-import { getGuestMode, storeGuestMode } from '@holi/core/screens/onboarding/helpers/guestModeAsyncStore'
+import { getGuestMode, storeGuestMode } from '@holi/core/screens/onboarding/helpers/guestModeStorage'
 import AsyncStorage from '@react-native-async-storage/async-storage'
 import { logError } from '@holi/core/errors/helpers'
 
@@ -17,7 +17,7 @@ jest.mock('@react-native-async-storage/async-storage', () => {
   }
 })
 
-describe('guestModeAsyncStore', () => {
+describe('guestModeStorage', () => {
   it('should return true when guest mode is enabled', async () => {
     mockGetStorage.mockResolvedValueOnce('true')
 
@@ -42,7 +42,7 @@ describe('guestModeAsyncStore', () => {
 
     expect(result).toBeFalsy()
     expect(logError).toHaveBeenCalledWith(testError, 'Failed to get guest mode', {
-      location: 'guestModeAsyncStore.getGuestMode',
+      location: 'guestModeStorage.getGuestMode',
     })
   })
 
@@ -65,7 +65,7 @@ describe('guestModeAsyncStore', () => {
     await storeGuestMode(true)
 
     expect(logError).toHaveBeenCalledWith(testError, 'Failed to store guest mode', {
-      location: 'guestModeAsyncStore.storeGuestMode',
+      location: 'guestModeStorage.storeGuestMode',
     })
   })
 })
diff --git a/core/screens/onboarding/helpers/__tests__/guestModeStorage.web.test.ts b/core/screens/onboarding/helpers/__tests__/guestModeStorage.web.test.ts
new file mode 100644
index 0000000000000000000000000000000000000000..f5c6dd1b594461e076631772e1ce9ca35fc67180
--- /dev/null
+++ b/core/screens/onboarding/helpers/__tests__/guestModeStorage.web.test.ts
@@ -0,0 +1,100 @@
+import { getGuestMode, storeGuestMode } from '@holi/core/screens/onboarding/helpers/guestModeStorage.web'
+import { getCookie, setCookie, deleteCookie } from 'cookies-next'
+import { logError } from '@holi/core/errors/helpers'
+import AsyncStorage from '@react-native-async-storage/async-storage'
+
+jest.mock('@holi/core/errors/helpers', () => ({
+  logError: jest.fn(),
+}))
+
+const mockGetCookie = jest.mocked(getCookie)
+const mockSetCookie = jest.mocked(setCookie)
+const mockDeleteCookie = jest.mocked(deleteCookie)
+jest.mock('cookies-next', () => {
+  return {
+    getCookie: jest.fn(),
+    setCookie: jest.fn(),
+    deleteCookie: jest.fn(),
+  }
+})
+
+const mockDeleteStorage = AsyncStorage.removeItem as jest.Mock
+jest.mock('@react-native-async-storage/async-storage', () => {
+  return {
+    removeItem: jest.fn(),
+  }
+})
+
+describe('guestModeStorage', () => {
+  beforeEach(() => {
+    mockDeleteStorage.mockResolvedValue({})
+  })
+
+  it('should return true when guest mode is enabled', async () => {
+    mockGetCookie.mockReturnValueOnce('true')
+
+    const result = await getGuestMode()
+
+    expect(result).toBeTruthy()
+  })
+
+  it('should return false when guest mode is not set', async () => {
+    mockGetCookie.mockReturnValueOnce(undefined)
+
+    const result = await getGuestMode()
+
+    expect(result).toBeFalsy()
+  })
+
+  it('should return false and log error when reading guest mode fails', async () => {
+    const testError = new Error('Test error')
+    mockGetCookie.mockImplementationOnce(() => {
+      throw testError
+    })
+
+    const result = await getGuestMode()
+
+    expect(result).toBeFalsy()
+    expect(logError).toHaveBeenCalledWith(testError, 'Failed to get guest mode', {
+      location: 'guestModeStorage.getGuestMode',
+    })
+  })
+
+  it('should store true when guest mode is enabled', async () => {
+    await storeGuestMode(true)
+
+    expect(mockSetCookie).toHaveBeenCalledWith('guest_mode', 'true', {
+      maxAge: 31536000, // 1 year in seconds
+    })
+  })
+
+  it('should remove storage when guest mode is disabled', async () => {
+    await storeGuestMode(false)
+
+    expect(mockDeleteCookie).toHaveBeenCalledWith('guest_mode')
+  })
+
+  it('should log error when storing guest mode fails', async () => {
+    const testError = new Error('Test error')
+    mockSetCookie.mockImplementationOnce(() => {
+      throw testError
+    })
+
+    await storeGuestMode(true)
+
+    expect(logError).toHaveBeenCalledWith(testError, 'Failed to store guest mode', {
+      location: 'guestModeStorage.storeGuestMode',
+    })
+  })
+
+  it('should clean up old guest mode', async () => {
+    jest.useFakeTimers()
+
+    await getGuestMode()
+    jest.runOnlyPendingTimers()
+
+    expect(mockDeleteStorage).toHaveBeenCalledWith('guest_mode')
+
+    jest.useRealTimers()
+  })
+})
diff --git a/core/screens/onboarding/helpers/__tests__/isAccountComplete.test.ts b/core/screens/onboarding/helpers/__tests__/isAccountComplete.test.ts
new file mode 100644
index 0000000000000000000000000000000000000000..e06df603695fad242f9ee9487ae4272d72fffc07
--- /dev/null
+++ b/core/screens/onboarding/helpers/__tests__/isAccountComplete.test.ts
@@ -0,0 +1,29 @@
+import type { User } from '@holi/core/domain/shared/types'
+import { isAccountComplete } from '@holi/core/screens/onboarding/helpers/isAccountComplete'
+
+describe('isAccountComplete', () => {
+  it('should return true if user has identity and firstName', () => {
+    const user = {
+      identity: 'ada',
+      firstName: 'Ada',
+    } as User
+
+    expect(isAccountComplete(user)).toBeTruthy()
+  })
+
+  it('should return false if user is missing an identity', () => {
+    const user = {
+      firstName: 'Ada',
+    } as User
+
+    expect(isAccountComplete(user)).toBeFalsy()
+  })
+
+  it('should return true if user is missing a firstName', () => {
+    const user = {
+      identity: 'ada',
+    } as User
+
+    expect(isAccountComplete(user)).toBeFalsy()
+  })
+})
diff --git a/core/screens/onboarding/helpers/guestModeAsyncStore.ts b/core/screens/onboarding/helpers/guestModeStorage.ts
similarity index 88%
rename from core/screens/onboarding/helpers/guestModeAsyncStore.ts
rename to core/screens/onboarding/helpers/guestModeStorage.ts
index 6967c5e9ce51175e72f7d51103f9cc7f8624b987..c53894b3c72af6194bcffa2239e5e329856d7549 100644
--- a/core/screens/onboarding/helpers/guestModeAsyncStore.ts
+++ b/core/screens/onboarding/helpers/guestModeStorage.ts
@@ -12,7 +12,7 @@ export const storeGuestMode = async (guestMode?: boolean): Promise<void> => {
     }
   } catch (error) {
     logError(error, 'Failed to store guest mode', {
-      location: 'guestModeAsyncStore.storeGuestMode',
+      location: 'guestModeStorage.storeGuestMode',
     })
   }
 }
@@ -22,7 +22,7 @@ export const getGuestMode = async (): Promise<boolean> => {
     return userData ? true : false
   } catch (error) {
     logError(error, 'Failed to get guest mode', {
-      location: 'guestModeAsyncStore.getGuestMode',
+      location: 'guestModeStorage.getGuestMode',
     })
     return false
   }
diff --git a/core/screens/onboarding/helpers/guestModeStorage.web.ts b/core/screens/onboarding/helpers/guestModeStorage.web.ts
new file mode 100644
index 0000000000000000000000000000000000000000..9de10c8da135d4a9016c671b87faec6a68780771
--- /dev/null
+++ b/core/screens/onboarding/helpers/guestModeStorage.web.ts
@@ -0,0 +1,38 @@
+import { logError } from '@holi/core/errors/helpers'
+import { getCookie, setCookie, deleteCookie } from 'cookies-next'
+import AsyncStore from '@react-native-async-storage/async-storage'
+
+export const GUEST_MODE_COOKIE_NAME = 'guest_mode'
+const one_year_in_seconds: number = 60 * 60 * 24 * 365
+
+export const storeGuestMode = async (guestMode?: boolean): Promise<void> => {
+  try {
+    if (guestMode) {
+      setCookie(GUEST_MODE_COOKIE_NAME, 'true', { maxAge: one_year_in_seconds })
+    } else {
+      deleteCookie(GUEST_MODE_COOKIE_NAME)
+    }
+  } catch (error) {
+    logError(error, 'Failed to store guest mode', {
+      location: 'guestModeStorage.storeGuestMode',
+    })
+  }
+}
+
+export const getGuestMode = async (): Promise<boolean> => {
+  try {
+    const guestMode = getCookie(GUEST_MODE_COOKIE_NAME)
+    cleanUpOldGuestMode().catch(() => {})
+    return !!guestMode
+  } catch (error) {
+    logError(error, 'Failed to get guest mode', {
+      location: 'guestModeStorage.getGuestMode',
+    })
+    return false
+  }
+}
+
+export const clearGuestMode = () => storeGuestMode()
+
+// Deprecated guest mode stored in AsyncStorage in 1.53
+const cleanUpOldGuestMode = () => AsyncStore.removeItem('guest_mode')
diff --git a/core/screens/onboarding/helpers/isAccountComplete.ts b/core/screens/onboarding/helpers/isAccountComplete.ts
new file mode 100644
index 0000000000000000000000000000000000000000..c46550685de0b6e00050306adb72ce4b80062a8f
--- /dev/null
+++ b/core/screens/onboarding/helpers/isAccountComplete.ts
@@ -0,0 +1,3 @@
+import type { User } from '@holi/core/domain/shared/types'
+
+export const isAccountComplete = (user?: User): boolean => !!user?.identity && !!user?.firstName
diff --git a/core/screens/onboarding/hooks/__tests__/onboardingState.test.ts b/core/screens/onboarding/hooks/__tests__/onboardingState.test.ts
index fc96ccf505e3e1d92d2f178d494b8128261816cc..8cd5f47d39225824c2e5fdc5d16e92b8fbcfa038 100644
--- a/core/screens/onboarding/hooks/__tests__/onboardingState.test.ts
+++ b/core/screens/onboarding/hooks/__tests__/onboardingState.test.ts
@@ -37,7 +37,9 @@ describe('useOnboardingState', () => {
   it('should update onboarding state', async () => {
     const { result } = renderHook(() => useOnboardingState())
 
-    storeOnboardingState('accountSetup')
+    act(() => {
+      storeOnboardingState('accountSetup')
+    })
 
     await waitFor(() => expect(result.current).toEqual('accountSetup'))
   })
@@ -45,7 +47,9 @@ describe('useOnboardingState', () => {
   it('should clear onboarding state', async () => {
     const { result } = renderHook(() => useOnboardingState())
 
-    clearOnboardingState()
+    act(() => {
+      clearOnboardingState()
+    })
 
     await waitFor(() => expect(result.current).toBeNull())
   })
@@ -69,9 +73,10 @@ describe('useOnboardingInitialization', () => {
       isLoading: true,
     })
 
-    renderOnboardingInitialization()
+    const { result } = renderOnboardingInitialization()
 
     expect(onboardingStateVar()).toBeNull()
+    expect(result.current.onboardingState).toBeNull()
   })
 
   it('should do nothing while guest mode is loading', () => {
@@ -80,9 +85,10 @@ describe('useOnboardingInitialization', () => {
       guestMode: false,
     })
 
-    renderOnboardingInitialization()
+    const { result } = renderOnboardingInitialization()
 
     expect(onboardingStateVar()).toBeNull()
+    expect(result.current.onboardingState).toBeNull()
   })
 
   const onboardingStates: (OnboardingStateValue | null)[] = [
@@ -101,9 +107,10 @@ describe('useOnboardingInitialization', () => {
       })
       if (state) storeOnboardingState(state)
 
-      renderOnboardingInitialization()
+      const { result } = renderOnboardingInitialization()
 
       expect(onboardingStateVar()).toEqual('accountSetup')
+      expect(result.current.onboardingState).toEqual('accountSetup')
     }
   )
 
@@ -117,9 +124,10 @@ describe('useOnboardingInitialization', () => {
       if (state) storeOnboardingState(state)
       mockUseVerificationFlowData.mockReturnValue({})
 
-      renderOnboardingInitialization()
+      const { result } = renderOnboardingInitialization()
 
       expect(onboardingStateVar()).toEqual('emailVerification')
+      expect(result.current.onboardingState).toEqual('emailVerification')
     }
   )
 
@@ -132,9 +140,10 @@ describe('useOnboardingInitialization', () => {
       if (state) storeOnboardingState(state)
       mockUseVerificationFlowData.mockReturnValue({})
 
-      renderOnboardingInitialization()
+      const { result } = renderOnboardingInitialization()
 
       expect(onboardingStateVar()).toEqual('emailVerification')
+      expect(result.current.onboardingState).toEqual('emailVerification')
     }
   )
 
@@ -172,9 +181,10 @@ describe('useOnboardingInitialization', () => {
       })
       if (state) storeOnboardingState(state)
 
-      renderOnboardingInitialization()
+      const { result } = renderOnboardingInitialization()
 
       expect(onboardingStateVar()).toEqual(expectedState)
+      expect(result.current.onboardingState).toEqual(expectedState)
     }
   )
 
@@ -208,12 +218,40 @@ describe('useOnboardingInitialization', () => {
       })
       if (state) storeOnboardingState(state)
 
-      renderOnboardingInitialization()
+      const { result } = renderOnboardingInitialization()
 
       expect(onboardingStateVar()).toEqual(expectedState)
+      expect(result.current.onboardingState).toEqual(expectedState)
     }
   )
 
+  it('should return isLoading as true if login state is loading', () => {
+    mockUseLoggedInUser.mockReturnValue({
+      isLoading: true,
+    })
+
+    const { result } = renderOnboardingInitialization()
+
+    expect(result.current.isLoading).toBeTruthy()
+  })
+
+  it('should return isLoading as true if guest mode is loading', () => {
+    mockUseGuestMode.mockReturnValue({
+      isLoading: true,
+      guestMode: false,
+    })
+
+    const { result } = renderOnboardingInitialization()
+
+    expect(result.current.isLoading).toBeTruthy()
+  })
+
+  it('should return isLoading as false if everything is initialized', () => {
+    const { result } = renderOnboardingInitialization()
+
+    expect(result.current.isLoading).toBeFalsy()
+  })
+
   describe('in guest mode', () => {
     beforeEach(() => {
       mockUseGuestMode.mockReturnValue({
@@ -231,9 +269,10 @@ describe('useOnboardingInitialization', () => {
         })
         if (state) storeOnboardingState(state)
 
-        renderOnboardingInitialization()
+        const { result } = renderOnboardingInitialization()
 
         expect(onboardingStateVar()).toEqual('accountSetup')
+        expect(result.current.onboardingState).toEqual('accountSetup')
       }
     )
 
@@ -247,9 +286,10 @@ describe('useOnboardingInitialization', () => {
         if (state) storeOnboardingState(state)
         mockUseVerificationFlowData.mockReturnValue({})
 
-        renderOnboardingInitialization()
+        const { result } = renderOnboardingInitialization()
 
         expect(onboardingStateVar()).toEqual('emailVerification')
+        expect(result.current.onboardingState).toEqual('emailVerification')
       }
     )
 
@@ -262,9 +302,10 @@ describe('useOnboardingInitialization', () => {
         if (state) storeOnboardingState(state)
         mockUseVerificationFlowData.mockReturnValue({})
 
-        renderOnboardingInitialization()
+        const { result } = renderOnboardingInitialization()
 
         expect(onboardingStateVar()).toEqual('emailVerification')
+        expect(result.current.onboardingState).toEqual('emailVerification')
       }
     )
 
@@ -276,9 +317,10 @@ describe('useOnboardingInitialization', () => {
         })
         if (state) storeOnboardingState(state)
 
-        renderOnboardingInitialization()
+        const { result } = renderOnboardingInitialization()
 
         expect(onboardingStateVar()).toEqual('finished')
+        expect(result.current.onboardingState).toEqual('finished')
       }
     )
   })
@@ -290,6 +332,10 @@ describe('useOnboardingRedirect', () => {
     mockUseLoggedInUser.mockReturnValue({
       isLoggedIn: false,
     })
+    mockUseGuestMode.mockReturnValue({
+      isLoading: false,
+      guestMode: false,
+    })
   })
   afterEach(async () => {
     await act(jest.runOnlyPendingTimers)
@@ -320,6 +366,39 @@ describe('useOnboardingRedirect', () => {
     expect(mockNavigate).toHaveBeenCalledWith(expectedRoute)
   })
 
+  it.each(testCasesRedirects)('should require onboarding on startup for state $state', ({ state }) => {
+    onboardingStateVar(state)
+    mockUsePathname.mockReturnValue('/')
+
+    const { result } = renderHook(() => useOnboardingRedirect())
+    jest.runOnlyPendingTimers()
+
+    expect(result.current.showOnboardingOnStartup).toBeTruthy()
+  })
+
+  it('should not require onboarding on startup for state "finished"', () => {
+    onboardingStateVar('finished')
+    mockUsePathname.mockReturnValue('/')
+
+    const { result } = renderHook(() => useOnboardingRedirect())
+    jest.runOnlyPendingTimers()
+
+    expect(result.current.showOnboardingOnStartup).toBeFalsy()
+  })
+
+  it('should not navigate if onboarding state is initializing', () => {
+    mockUseLoggedInUser.mockReturnValue({
+      isLoading: true,
+    })
+    onboardingStateVar('onboarding')
+    mockUsePathname.mockReturnValue('/')
+
+    renderHook(() => useOnboardingRedirect())
+    jest.runOnlyPendingTimers()
+
+    expect(mockNavigate).not.toHaveBeenCalled()
+  })
+
   it('should not navigate to onboarding if current screen is not home', () => {
     onboardingStateVar('onboarding')
     mockUsePathname.mockReturnValue('/volunteering')
diff --git a/core/screens/onboarding/hooks/__tests__/useGuestMode.test.ts b/core/screens/onboarding/hooks/__tests__/useGuestMode.test.ts
index 53c3ef131e4e21b5e5c3ee558c0138e16d275318..99797e29a867ed9bb91beaffed770cdfbca9e890 100644
--- a/core/screens/onboarding/hooks/__tests__/useGuestMode.test.ts
+++ b/core/screens/onboarding/hooks/__tests__/useGuestMode.test.ts
@@ -1,9 +1,9 @@
-import { getGuestMode } from '@holi/core/screens/onboarding/helpers/guestModeAsyncStore'
+import { getGuestMode } from '@holi/core/screens/onboarding/helpers/guestModeStorage'
 import { useGuestMode } from '@holi/core/screens/onboarding/hooks/useGuestMode'
 import { act, renderHook } from '@testing-library/react-native'
 
 const mockGetGuestMode = getGuestMode as jest.Mock
-jest.mock('@holi/core/screens/onboarding/helpers/guestModeAsyncStore', () => ({
+jest.mock('@holi/core/screens/onboarding/helpers/guestModeStorage', () => ({
   getGuestMode: jest.fn(),
 }))
 
diff --git a/core/screens/onboarding/hooks/__tests__/useOnboardingCurrentStepKey.test.ts b/core/screens/onboarding/hooks/__tests__/useOnboardingCurrentStepKey.test.ts
index 1ca1d355cf594b84fa59ea89bfb4a12b4ecb1499..e1622e6b6ecc0b11ecd551c60623c1c6875c83fe 100644
--- a/core/screens/onboarding/hooks/__tests__/useOnboardingCurrentStepKey.test.ts
+++ b/core/screens/onboarding/hooks/__tests__/useOnboardingCurrentStepKey.test.ts
@@ -5,6 +5,7 @@ import {
 } from '@holi/core/screens/onboarding/hooks/useOnboardingCurrentStepKey'
 import { renderHook } from '@testing-library/react-hooks'
 import { waitFor } from '@testing-library/react-native'
+import { useFocusEffect } from '@holi/core/helpers'
 
 const mockUseOnboardingState = useOnboardingState as jest.Mock
 jest.mock('@holi/core/screens/onboarding/hooks/onboardingState', () => {
@@ -13,7 +14,16 @@ jest.mock('@holi/core/screens/onboarding/hooks/onboardingState', () => {
   }
 })
 
+const mockUseFocusEffect = jest.mocked(useFocusEffect)
+jest.mock('@holi/core/helpers', () => ({
+  useFocusEffect: jest.fn(),
+}))
+
 describe('useOnboardingCurrentStepKey', () => {
+  beforeEach(() => {
+    mockUseFocusEffect.mockImplementation(jest.fn())
+  })
+
   const testCases: { state: OnboardingStateValue | null; expectedStep: OnboardingStepKey | null }[] = [
     {
       state: null,
@@ -64,4 +74,20 @@ describe('useOnboardingCurrentStepKey', () => {
       await waitFor(() => expect(result.current[0]).toEqual(expectedStep))
     }
   )
+
+  it('should reset current step on focus change', () => {
+    mockUseOnboardingState.mockReturnValue('onboarding')
+    mockUseFocusEffect.mockImplementation(jest.fn())
+
+    const { result, rerender } = renderHook(() => useOnboardingCurrentStepKey())
+
+    expect(result.current[0]).toBe('WELCOME_SCREEN')
+    mockUseOnboardingState.mockReturnValue(null)
+
+    // Simulate useFocusEffect call
+    mockUseFocusEffect.mock.calls[0][0]()
+    rerender()
+
+    expect(result.current[0]).toBeNull()
+  })
 })
diff --git a/core/screens/onboarding/hooks/onboardingState.ts b/core/screens/onboarding/hooks/onboardingState.ts
index d09aa3deba67d012dbdd9599ffc38b8f65e58625..c77630ca298cda50a1a1ef581b8267f274b5bd4b 100644
--- a/core/screens/onboarding/hooks/onboardingState.ts
+++ b/core/screens/onboarding/hooks/onboardingState.ts
@@ -1,5 +1,5 @@
 import { makeVar, useReactiveVar } from '@apollo/client'
-import { useCallback, useEffect } from 'react'
+import { useCallback, useEffect, useMemo, useState } from 'react'
 
 import { useLoggedInUser } from '@holi/core/auth/hooks/useLoggedInUser'
 import { usePathname } from '@holi/core/navigation/hooks/usePathname'
@@ -7,6 +7,7 @@ import useRouting from '@holi/core/navigation/hooks/useRouting'
 import { Platform } from 'react-native'
 import { useVerificationFlowData, type VerificationFlowState } from '@holi/core/auth/helpers/useVerificationFlowData'
 import { useGuestMode } from '@holi/core/screens/onboarding/hooks/useGuestMode'
+import { isAccountComplete } from '@holi/core/screens/onboarding/helpers/isAccountComplete'
 
 const onboardingValues = ['onboarding', 'emailVerification', 'accountSetup', 'finished'] as const // eslint-disable-line @typescript-eslint/no-unused-vars
 export type OnboardingStateValue = (typeof onboardingValues)[number]
@@ -61,35 +62,46 @@ export const useOnboardingInitialization = () => {
   const currentOnboardingState = useOnboardingState()
   const emailVerificationState = useVerificationFlowData()
   const { isLoading: isLoadingGuestMode, guestMode } = useGuestMode()
+  const [, forceUpdate] = useState(false)
 
   useEffect(() => {
     if (loginState.isLoading || isLoadingGuestMode) return
 
-    const accountCompleted = /*!!loginState.user?.identity &&*/ !!loginState.user?.firstName
-
     const targetState = determineTargetState({
       isLoggedIn: loginState.isLoggedIn,
-      accountCompleted,
+      accountCompleted: isAccountComplete(loginState.user),
       emailVerificationState,
       guestMode,
       value: currentOnboardingState,
     })
     if (currentOnboardingState !== targetState) {
       storeOnboardingState(targetState)
+      // FIXME Workaround for storeOnboardingState not always triggering a re-render
+      forceUpdate((prev) => !prev)
     }
   }, [
     emailVerificationState,
     loginState.isLoading,
     loginState.isLoggedIn,
-    loginState.user?.firstName,
-    loginState.user?.identity,
+    loginState.user,
     currentOnboardingState,
     isLoadingGuestMode,
     guestMode,
   ])
+
+  const isLoading = useMemo(
+    () => loginState.isLoading || isLoadingGuestMode || !currentOnboardingState,
+    [currentOnboardingState, isLoadingGuestMode, loginState.isLoading]
+  )
+
+  return {
+    isLoading,
+    onboardingState: currentOnboardingState,
+  }
 }
 
 export const useOnboardingRedirect = () => {
+  const { isLoading } = useOnboardingInitialization()
   const onboardingState = useOnboardingState()
   const pathname = usePathname()
   const { navigate } = useRouting()
@@ -102,7 +114,7 @@ export const useOnboardingRedirect = () => {
       if (Platform.OS !== 'web') {
         setTimeout(() => {
           navigate(path)
-        }, 100)
+        }, 200)
       } else {
         navigate(path)
       }
@@ -111,6 +123,10 @@ export const useOnboardingRedirect = () => {
   )
 
   useEffect(() => {
+    if (isLoading) {
+      return
+    }
+
     const isOnboarding = onboardingState === 'onboarding'
     const isEmailVerification = onboardingState === 'emailVerification'
     const isAccountSetup = onboardingState === 'accountSetup'
@@ -120,5 +136,9 @@ export const useOnboardingRedirect = () => {
     } else if (isOnboarding && pathname === '/') {
       navigateWithTimeout('/onboarding')
     }
-  }, [navigateWithTimeout, onboardingState, pathname])
+  }, [isLoading, navigateWithTimeout, onboardingState, pathname])
+
+  return {
+    showOnboardingOnStartup: onboardingState !== 'finished' && pathname === '/',
+  }
 }
diff --git a/core/screens/onboarding/hooks/useGuestMode.ts b/core/screens/onboarding/hooks/useGuestMode.ts
index cfa7f43a3f386aa43e9ba48986aad49ad69f0b62..730b60381e525404cd7a0655cf59822787883ad3 100644
--- a/core/screens/onboarding/hooks/useGuestMode.ts
+++ b/core/screens/onboarding/hooks/useGuestMode.ts
@@ -1,4 +1,4 @@
-import { getGuestMode } from '@holi/core/screens/onboarding/helpers/guestModeAsyncStore'
+import { getGuestMode } from '@holi/core/screens/onboarding/helpers/guestModeStorage'
 import { useEffect, useState } from 'react'
 
 export const useGuestMode = () => {
diff --git a/core/screens/onboarding/hooks/useOnboardingCurrentStepKey.ts b/core/screens/onboarding/hooks/useOnboardingCurrentStepKey.ts
index 2f502fbbf95363c7407b64f2f19465a13bb8bd92..2392c578b74ab5c77259e8b09adcc6de7d4b4c30 100644
--- a/core/screens/onboarding/hooks/useOnboardingCurrentStepKey.ts
+++ b/core/screens/onboarding/hooks/useOnboardingCurrentStepKey.ts
@@ -1,6 +1,7 @@
-import { useEffect, useRef, useState } from 'react'
+import { useCallback, useEffect, useRef, useState } from 'react'
 import type { HoliStepperItem } from '@holi/ui/components/organisms/HoliStepperV2'
 import { type OnboardingStateValue, useOnboardingState } from '@holi/core/screens/onboarding/hooks/onboardingState'
+import { useFocusEffect } from '@holi/core/helpers'
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const OnboardingStepKeys = [
@@ -73,5 +74,11 @@ export const useOnboardingCurrentStepKey = () => {
     }
   }, [onboardingState])
 
+  useFocusEffect(
+    useCallback(() => {
+      setCurrentStepKey(determineOnboardingInitialStepKey(onboardingState))
+    }, [onboardingState])
+  )
+
   return [currentStepKey, setCurrentStepKey] as const
 }
diff --git a/core/screens/onboarding/steps/CreateAccount.tsx b/core/screens/onboarding/steps/CreateAccount.tsx
index 6a158d94bf68e310b10971653cb87d73560534e6..6222faf076518cf4d11f6b3dbf46eddabc1c7396 100644
--- a/core/screens/onboarding/steps/CreateAccount.tsx
+++ b/core/screens/onboarding/steps/CreateAccount.tsx
@@ -26,7 +26,7 @@ import HoliLogo from '@holi/ui/components/atoms/HoliLogo'
 import HoliLoader, { useLoader } from '@holi/ui/components/molecules/HoliLoader'
 import { type HoliTheme, useTheme } from '@holi/ui/styles/theme'
 import { Text } from 'holi-bricks/components/text'
-import { clearGuestMode, storeGuestMode } from '@holi/core/screens/onboarding/helpers/guestModeAsyncStore'
+import { clearGuestMode, storeGuestMode } from '@holi/core/screens/onboarding/helpers/guestModeStorage'
 
 const logger = getLogger('CreateAccount')
 
diff --git a/core/screens/onboarding/steps/EmailVerification.tsx b/core/screens/onboarding/steps/EmailVerification.tsx
index a24edac96308f5b7189fd18524543a2b121293da..e8f668fa505b318fa672066d74c176a44db7e249 100644
--- a/core/screens/onboarding/steps/EmailVerification.tsx
+++ b/core/screens/onboarding/steps/EmailVerification.tsx
@@ -19,7 +19,7 @@ import HoliTextInput from '@holi/ui/components/molecules/HoliTextInput'
 import { HoliToastType, useToast } from '@holi/ui/components/molecules/HoliToastProvider'
 import { type HoliTheme, useTheme } from '@holi/ui/styles/theme'
 import { storeOnboardingState } from '@holi/core/screens/onboarding/hooks/onboardingState'
-import { storeGuestMode } from '@holi/core/screens/onboarding/helpers/guestModeAsyncStore'
+import { storeGuestMode } from '@holi/core/screens/onboarding/helpers/guestModeStorage'
 
 const CODE_MAX_COUNT = 6
 
diff --git a/core/screens/onboarding/steps/__tests__/CreateAccount.test.tsx b/core/screens/onboarding/steps/__tests__/CreateAccount.test.tsx
index a98d9ce14610044a07a5b7ee3ff998264c107fe1..b71b6df74b36394db248a725f46378d64fbff9ef 100644
--- a/core/screens/onboarding/steps/__tests__/CreateAccount.test.tsx
+++ b/core/screens/onboarding/steps/__tests__/CreateAccount.test.tsx
@@ -11,7 +11,7 @@ import { TrackingEvent } from '@holi/core/tracking'
 import useTracking from '@holi/core/tracking/hooks/useTracking'
 import { newKratosSdk } from '@holi/core/auth/helpers/sdk'
 import { setVerificationFlowData } from '@holi/core/auth/helpers/useVerificationFlowData'
-import { clearGuestMode, storeGuestMode } from '@holi/core/screens/onboarding/helpers/guestModeAsyncStore'
+import { clearGuestMode, storeGuestMode } from '@holi/core/screens/onboarding/helpers/guestModeStorage'
 
 const mockUseErrorHandling = useErrorHandling as jest.Mock
 jest.mock('@holi/core/errors/hooks', () => ({
@@ -47,7 +47,7 @@ jest.mock('@holi/core/auth/helpers/sdk', () => ({
 
 const mockClearGuestMode = clearGuestMode as jest.Mock
 const mockStoreGuestMode = storeGuestMode as jest.Mock
-jest.mock('@holi/core/screens/onboarding/helpers/guestModeAsyncStore', () => ({
+jest.mock('@holi/core/screens/onboarding/helpers/guestModeStorage', () => ({
   clearGuestMode: jest.fn(),
   storeGuestMode: jest.fn(),
 }))
diff --git a/core/screens/onboarding/steps/__tests__/EmailVerification.test.tsx b/core/screens/onboarding/steps/__tests__/EmailVerification.test.tsx
index 8df49e81f2ac1638a9723e5c6d7c9d4cf99131fe..c06b70f5278b0af2ffdcb9686844561ca919e9a6 100644
--- a/core/screens/onboarding/steps/__tests__/EmailVerification.test.tsx
+++ b/core/screens/onboarding/steps/__tests__/EmailVerification.test.tsx
@@ -10,7 +10,7 @@ import { TrackingEvent } from '@holi/core/tracking'
 import useTracking from '@holi/core/tracking/hooks/useTracking'
 import { act, render, screen, userEvent, waitFor } from '@testing-library/react-native'
 import React from 'react'
-import { storeGuestMode } from '@holi/core/screens/onboarding/helpers/guestModeAsyncStore'
+import { storeGuestMode } from '@holi/core/screens/onboarding/helpers/guestModeStorage'
 
 const mockClearVerificationFlowData = clearVerificationFlowData as jest.Mock
 const mockUseVerificationFlowData = useVerificationFlowData as jest.Mock
@@ -56,7 +56,7 @@ jest.mock('@holi/core/screens/onboarding/hooks/onboardingState', () => ({
 }))
 
 const mockStoreGuestMode = storeGuestMode as jest.Mock
-jest.mock('@holi/core/screens/onboarding/helpers/guestModeAsyncStore', () => ({
+jest.mock('@holi/core/screens/onboarding/helpers/guestModeStorage', () => ({
   storeGuestMode: jest.fn(),
 }))
 
diff --git a/core/screens/userprofile/components/AnonymousProfileView.tsx b/core/screens/userprofile/components/AnonymousProfileView.tsx
index f83ee36c5709fa6c62fc65d35ac7e3ba18363ad2..730e1fc7dc888350542a1924fd1a20354e777d12 100644
--- a/core/screens/userprofile/components/AnonymousProfileView.tsx
+++ b/core/screens/userprofile/components/AnonymousProfileView.tsx
@@ -20,7 +20,7 @@ import HoliText from '@holi/ui/components/atoms/HoliText'
 import { type HoliTheme, useTheme } from '@holi/ui/styles/theme'
 import { Avatar } from 'holi-bricks/components/avatar'
 import { isProduction } from '@holi/core/helpers/environment'
-import { clearGuestMode } from '@holi/core/screens/onboarding/helpers/guestModeAsyncStore'
+import { clearGuestMode } from '@holi/core/screens/onboarding/helpers/guestModeStorage'
 import { clearOnboardingState } from '@holi/core/screens/onboarding/hooks/onboardingState'
 
 const AnonymousProfileView = () => {
@@ -128,7 +128,7 @@ const AnonymousProfileView = () => {
             onPress={async () => {
               await clearGuestMode()
               clearOnboardingState()
-              navigate('/')
+              navigate('/onboarding')
             }}
             style={styles.settingsItem}
           />
diff --git a/core/screens/userprofile/components/__tests__/AnonymousProfileView.test.tsx b/core/screens/userprofile/components/__tests__/AnonymousProfileView.test.tsx
index 60f49b75ff921bb56d6e4594a15fbf37000bb810..bfafc9171d763325698c8a22e2b59cdd2d3a5429 100644
--- a/core/screens/userprofile/components/__tests__/AnonymousProfileView.test.tsx
+++ b/core/screens/userprofile/components/__tests__/AnonymousProfileView.test.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import AnonymousProfileView from '@holi/core/screens/userprofile/components/AnonymousProfileView'
 import { render, screen, userEvent, waitFor } from '@testing-library/react-native'
-import { clearGuestMode } from '@holi/core/screens/onboarding/helpers/guestModeAsyncStore'
+import { clearGuestMode } from '@holi/core/screens/onboarding/helpers/guestModeStorage'
 import { clearOnboardingState } from '@holi/core/screens/onboarding/hooks/onboardingState'
 import { useFeatureFlag } from '@holi/core/featureFlags/hooks/useFeatureFlag'
 
@@ -13,7 +13,7 @@ jest.mock('@holi/core/helpers/environment', () => ({
 }))
 
 const mockClearGuestMode = clearGuestMode as jest.Mock
-jest.mock('@holi/core/screens/onboarding/helpers/guestModeAsyncStore', () => ({
+jest.mock('@holi/core/screens/onboarding/helpers/guestModeStorage', () => ({
   clearGuestMode: jest.fn(),
 }))
 
@@ -62,6 +62,6 @@ describe('AnonymousProfileView', () => {
 
     await waitFor(() => expect(mockClearOnboardingState).toHaveBeenCalled())
     expect(mockClearGuestMode).toHaveBeenCalled()
-    expect(mockNavigate).toHaveBeenCalledWith('/')
+    expect(mockNavigate).toHaveBeenCalledWith('/onboarding')
   })
 })
diff --git a/holi-apps/volunteering/hooks/useRandomizedRecos.ts b/holi-apps/volunteering/hooks/useRandomizedRecos.ts
index 91c77271cc700af2904c1875994986f887b8df5d..f8ce10c88d0b43b1db6f9d834fee5a9935e91ce7 100644
--- a/holi-apps/volunteering/hooks/useRandomizedRecos.ts
+++ b/holi-apps/volunteering/hooks/useRandomizedRecos.ts
@@ -2,12 +2,13 @@ import { useEffect, useState } from 'react'
 import AsyncStorage from '@react-native-async-storage/async-storage'
 import type { VolunteeringReco } from '@holi-apps/volunteering/types'
 import { logError } from '@holi/core/errors/helpers'
+import { DEBUG_LOG_COMPONENTS } from '@holi/core/helpers/logging/constants'
 
 const STORAGE_KEY = 'volunteering_recos_randomization'
 const REFRESH_INTERVAL_MS = 24 * 60 * 60 * 1000 // 24 hours
 
 // For development debugging only
-const DEBUG = process.env.NODE_ENV === 'development'
+const DEBUG = process.env.NODE_ENV === 'development' && DEBUG_LOG_COMPONENTS.RandomizationState
 
 interface RandomizationState {
   lastRefreshTimestamp: number