diff --git a/changelog/unreleased/enhancement-enable-user-preferences-in-public-links b/changelog/unreleased/enhancement-enable-user-preferences-in-public-links
new file mode 100644
index 00000000000..5aafd1872c0
--- /dev/null
+++ b/changelog/unreleased/enhancement-enable-user-preferences-in-public-links
@@ -0,0 +1,6 @@
+Enhancement: Enable user preferences in public links
+
+We've enabled user preferences in public links, so any user even without an account can open
+preferences in a public link context and for example change the current language.
+
+https://github.com/owncloud/web/pull/10207
diff --git a/packages/web-app-admin-settings/src/index.ts b/packages/web-app-admin-settings/src/index.ts
index a5e8e7fe625..c3dae358125 100644
--- a/packages/web-app-admin-settings/src/index.ts
+++ b/packages/web-app-admin-settings/src/index.ts
@@ -161,7 +161,13 @@ export default defineWebApplication({
         isFileEditor: false,
         applicationMenu: {
           enabled: () => {
-            return userStore.user && can('read-all', 'Setting')
+            return (
+              userStore.user &&
+              (can('read-all', 'Setting') ||
+                can('read-all', 'Account') ||
+                can('read-all', 'Group') ||
+                can('read-all', 'Drive'))
+            )
           },
           priority: 40
         }
diff --git a/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue b/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue
index 379c1ff4ffd..d7209b4bebe 100644
--- a/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue
+++ b/packages/web-app-files/src/components/SideBar/Details/FileDetails.vue
@@ -246,7 +246,11 @@ export default defineComponent({
       })
     })
     const showWebDavDetails = computed(() => {
-      return store.getters['Files/areWebDavDetailsShown']
+      /**
+       * webDavPath might not be set when user is navigating on public link,
+       * even if the user is authenticated and the file owner.
+       */
+      return store.getters['Files/areWebDavDetailsShown'] && unref(resource).webDavPath
     })
     const formatDateRelative = (date) => {
       return formatRelativeDateFromJSDate(new Date(date), language.current)
diff --git a/packages/web-app-files/src/components/SideBar/Details/TagsSelect.vue b/packages/web-app-files/src/components/SideBar/Details/TagsSelect.vue
index 1b2a300fe39..035b44a74ad 100644
--- a/packages/web-app-files/src/components/SideBar/Details/TagsSelect.vue
+++ b/packages/web-app-files/src/components/SideBar/Details/TagsSelect.vue
@@ -236,7 +236,13 @@ export default defineComponent({
       if (unref(resource)?.tags) {
         selectedTags.value = unref(currentTags)
       }
-      loadAvailableTagsTask.perform()
+
+      /**
+       * If the user can't edit the tags, for example on a public link, there is no need to load the available tags
+       */
+      if (!unref(readonly)) {
+        loadAvailableTagsTask.perform()
+      }
     })
 
     const keydownMethods = (map, vm) => {
diff --git a/packages/web-app-files/src/index.ts b/packages/web-app-files/src/index.ts
index 340ec8fb193..4f679303646 100644
--- a/packages/web-app-files/src/index.ts
+++ b/packages/web-app-files/src/index.ts
@@ -34,12 +34,9 @@ const appInfo = {
   icon: 'resource-type-folder',
   color: 'var(--oc-color-swatch-primary-muted)',
   isFileEditor: false,
-  extensions: [],
-  applicationMenu: {
-    enabled: () => true,
-    priority: 10
-  }
+  extensions: []
 }
+
 export const navItems = (context): AppNavigationItem[] => {
   const spacesStores = useSpacesStore()
   const userStore = useUserStore()
@@ -127,8 +124,18 @@ export const navItems = (context): AppNavigationItem[] => {
 
 export default defineWebApplication({
   setup() {
+    const userStore = useUserStore()
+
     return {
-      appInfo,
+      appInfo: {
+        ...appInfo,
+        applicationMenu: {
+          enabled: () => {
+            return !!userStore.user
+          },
+          priority: 10
+        }
+      },
       store,
       routes: buildRoutes({
         App,
diff --git a/packages/web-app-files/tests/unit/views/spaces/DriveResolver.spec.ts b/packages/web-app-files/tests/unit/views/spaces/DriveResolver.spec.ts
index 976c29b1a2e..52629328b5e 100644
--- a/packages/web-app-files/tests/unit/views/spaces/DriveResolver.spec.ts
+++ b/packages/web-app-files/tests/unit/views/spaces/DriveResolver.spec.ts
@@ -78,7 +78,7 @@ describe('DriveResolver view', () => {
       space,
       internalSpace,
       mocks: { $clientService: clientService },
-      isUserContextReady: true
+      userContextReady: true
     })
 
     await wrapper.vm.$nextTick()
@@ -94,7 +94,7 @@ describe('DriveResolver view', () => {
     const { wrapper, mocks } = getMountedWrapper({
       space,
       mocks: { $clientService: clientService },
-      isUserContextReady: true
+      userContextReady: true
     })
 
     await wrapper.vm.$nextTick()
@@ -121,7 +121,7 @@ function getMountedWrapper({
   space = undefined,
   internalSpace = undefined,
   currentRouteName = 'files-spaces-generic',
-  isUserContextReady = false,
+  userContextReady = false,
   driveAliasAndItem = 'personal/einstein/file',
   fileId = '1'
 } = {}) {
@@ -157,7 +157,7 @@ function getMountedWrapper({
       global: {
         plugins: [
           ...defaultPlugins({
-            piniaOptions: { authState: { userContextReady: isUserContextReady } }
+            piniaOptions: { authState: { userContextReady: userContextReady } }
           }),
           store
         ],
diff --git a/packages/web-app-ocm/src/index.ts b/packages/web-app-ocm/src/index.ts
index 823ff098966..16629c083e3 100644
--- a/packages/web-app-ocm/src/index.ts
+++ b/packages/web-app-ocm/src/index.ts
@@ -1,5 +1,5 @@
 import App from './views/App.vue'
-import { defineWebApplication, useRouter } from '@ownclouders/web-pkg'
+import { defineWebApplication, useRouter, useUserStore } from '@ownclouders/web-pkg'
 import translations from '../l10n/translations.json'
 import { extensions } from './extensions'
 import { RouteRecordRaw } from 'vue-router'
@@ -27,13 +27,19 @@ export default defineWebApplication({
   setup() {
     const { $gettext } = useGettext()
     const router = useRouter()
+    const userStore = useUserStore()
 
     const appInfo = {
       name: $gettext('ScienceMesh'),
       id: 'ocm',
       color: '#AE291D',
       icon: 'contacts-book',
-      isFileEditor: false
+      isFileEditor: false,
+      applicationMenu: {
+        enabled: () => {
+          return !!userStore.user
+        }
+      }
     }
 
     router.addRoute({
diff --git a/packages/web-app-search/tests/unit/portals/SearchBar.spec.ts b/packages/web-app-search/tests/unit/portals/SearchBar.spec.ts
index 8d0fde261ae..178d14eaef1 100644
--- a/packages/web-app-search/tests/unit/portals/SearchBar.spec.ts
+++ b/packages/web-app-search/tests/unit/portals/SearchBar.spec.ts
@@ -94,7 +94,7 @@ describe('Search Bar portal component', () => {
     expect(wrapper.find(selectors.search).exists()).toBeFalsy()
   })
   test('does not render a search field if no user given', () => {
-    wrapper = getMountedWrapper({ isUserContextReady: false }).wrapper
+    wrapper = getMountedWrapper({ userContextReady: false }).wrapper
     expect(wrapper.find(selectors.search).exists()).toBeFalsy()
   })
   test('updates the search term on input', () => {
@@ -228,7 +228,7 @@ describe('Search Bar portal component', () => {
 
 function getMountedWrapper({
   mocks = {},
-  isUserContextReady = true,
+  userContextReady = true,
   providers = [providerFiles, providerContacts]
 } = {}) {
   jest.mocked(useAvailableProviders).mockReturnValue(ref(providers))
@@ -253,7 +253,7 @@ function getMountedWrapper({
       global: {
         plugins: [
           ...defaultPlugins({
-            piniaOptions: { authState: { userContextReady: isUserContextReady } }
+            piniaOptions: { authState: { userContextReady: userContextReady } }
           }),
           store
         ],
diff --git a/packages/web-pkg/src/apps/types.ts b/packages/web-pkg/src/apps/types.ts
index 8b5fb31fc52..be8d2be6cca 100644
--- a/packages/web-pkg/src/apps/types.ts
+++ b/packages/web-pkg/src/apps/types.ts
@@ -42,7 +42,7 @@ export interface ApplicationQuickAction {
 export type AppConfigObject = Record<string, any>
 
 export interface ApplicationMenuItem {
-  enabled?: () => boolean
+  enabled: () => boolean
   priority?: number
   openAsEditor?: boolean
 }
diff --git a/packages/web-pkg/src/composables/piniaStores/apps.ts b/packages/web-pkg/src/composables/piniaStores/apps.ts
index c18cbb9a82c..4738dd57afc 100644
--- a/packages/web-pkg/src/composables/piniaStores/apps.ts
+++ b/packages/web-pkg/src/composables/piniaStores/apps.ts
@@ -21,7 +21,7 @@ export const useAppsStore = defineStore('apps', () => {
     }
 
     unref(apps)[appInfo.id] = {
-      applicationMenu: appInfo.applicationMenu || {},
+      applicationMenu: appInfo.applicationMenu || { enabled: () => false },
       defaultExtension: appInfo.defaultExtension || '',
       icon: 'check_box_outline_blank',
       name: appInfo.name || appInfo.id,
diff --git a/packages/web-pkg/tests/unit/components/FilesList/ResourceTable.spec.ts b/packages/web-pkg/tests/unit/components/FilesList/ResourceTable.spec.ts
index 09af41c037a..3bb5ed473f0 100644
--- a/packages/web-pkg/tests/unit/components/FilesList/ResourceTable.spec.ts
+++ b/packages/web-pkg/tests/unit/components/FilesList/ResourceTable.spec.ts
@@ -422,7 +422,7 @@ describe('ResourceTable', () => {
         const resource = mockDeep<Resource>({ id: '1', tags: ['1'] })
         const { wrapper } = getMountedWrapper({
           props: { resources: [resource] },
-          isUserContextReady: false
+          userContextReady: false
         })
         const resourceRow = wrapper.find(`[data-item-id="${resource.id}"]`)
         expect(resourceRow.find('.resource-table-tag-wrapper').element.tagName).toEqual('SPAN')
@@ -456,7 +456,7 @@ describe('ResourceTable', () => {
 
 function getMountedWrapper({
   props = {},
-  isUserContextReady = true,
+  userContextReady = true,
   addProcessingResources = false
 } = {}) {
   const storeOptions = defaultStoreMockOptions
@@ -494,7 +494,7 @@ function getMountedWrapper({
         plugins: [
           ...defaultPlugins({
             piniaOptions: {
-              authState: { userContextReady: isUserContextReady },
+              authState: { userContextReady: userContextReady },
               capabilityState: { capabilities }
             }
           }),
diff --git a/packages/web-runtime/src/components/Topbar/TopBar.vue b/packages/web-runtime/src/components/Topbar/TopBar.vue
index 574910ba672..d353a52ac6b 100644
--- a/packages/web-runtime/src/components/Topbar/TopBar.vue
+++ b/packages/web-runtime/src/components/Topbar/TopBar.vue
@@ -9,13 +9,13 @@
         v-if="appMenuItems.length && !isEmbedModeEnabled"
         :applications-list="appMenuItems"
       />
-      <router-link
-        ref="navigationSidebarLogo"
-        v-oc-tooltip="$gettext('Back to home')"
-        to="/"
-        class="oc-width-1-1"
-      >
-        <oc-img :src="currentTheme.logo.topbar" :alt="sidebarLogoAlt" class="oc-logo-image" />
+      <router-link ref="navigationSidebarLogo" :to="homeLink" class="oc-width-1-1">
+        <oc-img
+          v-oc-tooltip="$gettext('Back to home')"
+          :src="currentTheme.logo.topbar"
+          :alt="sidebarLogoAlt"
+          class="oc-logo-image"
+        />
       </router-link>
     </div>
     <div v-if="!contentOnLeftPortal" class="oc-topbar-center">
@@ -56,13 +56,11 @@ import {
   useAuthStore,
   useCapabilityStore,
   useEmbedMode,
-  useExtensionRegistry,
   useRouter,
   useStore,
   useThemeStore
 } from '@ownclouders/web-pkg'
 import { isRuntimeRoute } from '../../router'
-import { getExtensionNavItems } from '../../helpers/navItems'
 
 export default {
   components: {
@@ -83,7 +81,6 @@ export default {
   setup(props) {
     const store = useStore()
     const capabilityStore = useCapabilityStore()
-    const extensionRegistry = useExtensionRegistry()
     const themeStore = useThemeStore()
     const { currentTheme } = storeToRefs(themeStore)
 
@@ -100,6 +97,17 @@ export default {
       )
     })
 
+    const homeLink = computed(() => {
+      if (authStore.publicLinkContextReady && !authStore.userContextReady) {
+        return {
+          name: 'resolvePublicLink',
+          params: { token: authStore.publicLinkToken }
+        }
+      }
+
+      return '/'
+    })
+
     const isSideBarToggleVisible = computed(() => {
       return authStore.userContextReady || authStore.publicLinkContextReady
     })
@@ -115,7 +123,7 @@ export default {
     }
 
     /**
-     * Returns well formed menuItem objects by a list of extensions.
+     * Returns well-formed menuItem objects by a list of extensions.
      * The following properties must be accessible in the wrapping code:
      * - applicationsList
      * - $language
@@ -128,14 +136,10 @@ export default {
       return props.applicationsList
         .filter((app) => {
           if (app.type === 'extension') {
-            // check if the extension has at least one navItem with a matching menuId
             return (
-              getExtensionNavItems({ extensionRegistry, appId: app.id }).filter((navItem) =>
-                isNavItemPermitted(permittedMenus, navItem)
-              ).length > 0 ||
-              (app.applicationMenu.enabled instanceof Function &&
-                app.applicationMenu.enabled(store, ability) &&
-                !permittedMenus.includes('user'))
+              app.applicationMenu.enabled instanceof Function &&
+              app.applicationMenu.enabled(store, ability) &&
+              !permittedMenus.includes('user')
             )
           }
           return isNavItemPermitted(permittedMenus, app)
@@ -209,7 +213,8 @@ export default {
       logoWidth,
       isEmbedModeEnabled,
       isSideBarToggleVisible,
-      isSideBarToggleDisabled
+      isSideBarToggleDisabled,
+      homeLink
     }
   },
   computed: {
diff --git a/packages/web-runtime/src/components/Topbar/UserMenu.vue b/packages/web-runtime/src/components/Topbar/UserMenu.vue
index f1c15839d8e..c246016cc48 100644
--- a/packages/web-runtime/src/components/Topbar/UserMenu.vue
+++ b/packages/web-runtime/src/components/Topbar/UserMenu.vue
@@ -10,17 +10,17 @@
     >
       <avatar-image
         v-if="onPremisesSamAccountName"
-        class="oc-topbar-personal-avatar oc-flex-inline oc-flex-center oc-flex-middle"
+        class="oc-topbar-avatar oc-topbar-personal-avatar oc-flex-inline oc-flex-center oc-flex-middle"
         :width="32"
         :userid="onPremisesSamAccountName"
         :user-name="user.displayName"
       />
       <oc-avatar-item
         v-else
-        class="oc-topbar-unauthenticated-avatar oc-flex-inline oc-flex-center oc-flex-middle"
+        class="oc-topbar-avatar oc-topbar-unauthenticated-avatar oc-flex-inline oc-flex-center oc-flex-middle"
         :name="$gettext('User Menu login')"
         :width="32"
-        icon="user-add"
+        icon="user"
         icon-fill-type="line"
         icon-color="var(--oc-color-swatch-brand-default)"
         background="var(--oc-color-swatch-brand-contrast)"
@@ -37,6 +37,17 @@
     >
       <oc-list class="user-menu-list">
         <template v-if="!onPremisesSamAccountName">
+          <li>
+            <oc-button
+              id="oc-topbar-account-manage"
+              type="router-link"
+              :to="accountPageRoute"
+              appearance="raw"
+            >
+              <oc-icon name="settings-4" fill-type="line" class="oc-p-xs" />
+              <span v-text="$gettext('Preferences')" />
+            </oc-button>
+          </li>
           <li>
             <oc-button
               id="oc-topbar-account-login"
@@ -50,22 +61,26 @@
           </li>
         </template>
         <template v-else>
+          <li class="profile-info-wrapper oc-pl-s">
+            <avatar-image
+              :width="32"
+              :userid="onPremisesSamAccountName"
+              :user-name="user.displayName"
+            />
+            <span class="profile-info-wrapper" :class="{ 'oc-py-xs': !user.mail }">
+              <span class="oc-display-block" v-text="user.displayName" />
+              <span v-if="user.mail" class="oc-text-small" v-text="user.mail" />
+            </span>
+          </li>
           <li>
             <oc-button
               id="oc-topbar-account-manage"
               type="router-link"
-              :to="{ path: '/account' }"
+              :to="accountPageRoute"
               appearance="raw"
             >
-              <avatar-image
-                :width="32"
-                :userid="onPremisesSamAccountName"
-                :user-name="user.displayName"
-              />
-              <span class="profile-info-wrapper" :class="{ 'oc-py-xs': !user.mail }">
-                <span class="oc-display-block" v-text="user.displayName" />
-                <span v-if="user.mail" class="oc-text-small" v-text="user.mail" />
-              </span>
+              <oc-icon name="settings-4" fill-type="line" class="oc-p-xs" />
+              <span v-text="$gettext('Preferences')" />
             </oc-button>
           </li>
           <li v-for="(app, index) in applicationsList" :key="`user-menu-${index}`">
@@ -86,10 +101,13 @@
           </li>
           <li v-if="quotaEnabled" class="storage-wrapper oc-pl-s">
             <oc-icon name="cloud" fill-type="line" class="oc-p-xs" />
-            <div class="storage-wrapper-text oc-width-1-1">
+            <div class="oc-width-1-1">
               <p class="oc-my-rm">
                 <span class="oc-display-block" v-text="personalStorageLabel" />
-                <span class="oc-text-small" v-text="personalStorageDetailsLabel" />
+                <span
+                  class="storage-wrapper-quota oc-text-small"
+                  v-text="personalStorageDetailsLabel"
+                />
               </p>
               <oc-progress
                 v-if="limitedPersonalStorage"
@@ -126,7 +144,13 @@ import { storeToRefs } from 'pinia'
 import { defineComponent, PropType, ComponentPublicInstance, computed, unref } from 'vue'
 import filesize from 'filesize'
 import { authService } from '../../services/auth'
-import { useRoute, useSpacesStore, useThemeStore, useUserStore } from '@ownclouders/web-pkg'
+import {
+  useRoute,
+  useSpacesStore,
+  useThemeStore,
+  useUserStore,
+  routeToContextQuery
+} from '@ownclouders/web-pkg'
 import { OcDrop } from 'design-system/src/components'
 
 export default defineComponent({
@@ -145,6 +169,11 @@ export default defineComponent({
 
     const { user } = storeToRefs(userStore)
 
+    const accountPageRoute = computed(() => ({
+      name: 'account',
+      query: routeToContextQuery(unref(route))
+    }))
+
     const loginLink = computed(() => {
       return {
         name: 'login',
@@ -161,6 +190,7 @@ export default defineComponent({
 
     return {
       user,
+      accountPageRoute,
       loginLink,
       imprintUrl,
       privacyUrl,
@@ -255,21 +285,12 @@ export default defineComponent({
       color: var(--oc-color-swatch-passive-default);
       text-decoration: none;
     }
-
-    .profile-info-wrapper {
-      text-align: left;
-      word-break: break-all;
-      line-height: initial;
-    }
   }
 
+  &.profile-info-wrapper,
   &.storage-wrapper {
     gap: var(--oc-space-medium);
     min-height: 3rem;
-
-    .storage-wrapper-text {
-      align-self: flex-end;
-    }
   }
 }
 
diff --git a/packages/web-runtime/src/pages/account.vue b/packages/web-runtime/src/pages/account.vue
index df5e56b7f90..10118a97470 100644
--- a/packages/web-runtime/src/pages/account.vue
+++ b/packages/web-runtime/src/pages/account.vue
@@ -1,18 +1,10 @@
 <template>
   <app-loading-spinner v-if="isLoading" />
   <main v-else id="account" class="oc-height-1-1 oc-m">
-    <div class="oc-flex oc-flex-between oc-flex-bottom oc-width-1-1 oc-border-b oc-py">
-      <h1 id="account-page-title" class="oc-page-title oc-m-rm">{{ pageTitle }}</h1>
-      <div>
-        <oc-button
-          v-if="!isChangePasswordDisabled"
-          variation="primary"
-          data-testid="account-page-edit-password-btn"
-          @click="showEditPasswordModal"
-        >
-          <oc-icon name="lock" />
-          <span v-text="$gettext('Change Password')" />
-        </oc-button>
+    <h1 id="account-page-title" class="oc-page-title oc-m-rm oc-invisible-sr">{{ pageTitle }}</h1>
+    <div v-if="showAccountSection">
+      <div class="oc-flex oc-flex-between oc-flex-bottom oc-width-1-1">
+        <h2 class="oc-text-bold" v-text="$gettext('Account Information')" />
         <oc-button
           v-if="accountEditLink"
           variation="primary"
@@ -25,9 +17,6 @@
           <span v-text="$gettext('Edit')" />
         </oc-button>
       </div>
-    </div>
-    <div>
-      <h2 class="oc-text-bold oc-mb" v-text="$gettext('Account Information')" />
       <dl class="account-page-info oc-flex oc-flex-wrap">
         <div class="account-page-info-username oc-mb oc-width-1-2@s">
           <dt class="oc-text-normal oc-text-muted" v-text="$gettext('Username')" />
@@ -35,14 +24,8 @@
             {{ user.onPremisesSamAccountName }}
           </dd>
         </div>
-        <div v-if="user.onPremisesSamAccountName && user.id" class="account-page-info-userid">
-          <dt class="oc-text-normal oc-text-muted" v-text="$gettext('User ID')" />
-          <dd>
-            {{ user.id }}
-          </dd>
-        </div>
         <div class="account-page-info-displayname oc-mb oc-width-1-2@s">
-          <dt class="oc-text-normal oc-text-muted" v-text="$gettext('Display name')" />
+          <dt class="oc-text-normal oc-text-muted" v-text="$gettext('First and last name')" />
           <dd>
             {{ user.displayName }}
           </dd>
@@ -65,7 +48,7 @@
             />
           </dd>
         </div>
-        <div v-if="logoutUrl" class="account-page-logout-all-devices oc-mb oc-width-1-2@s">
+        <div v-if="showLogout" class="account-page-logout-all-devices oc-mb oc-width-1-2@s">
           <dt
             class="oc-text-normal oc-text-muted"
             v-text="$gettext('Logout from active devices')"
@@ -88,10 +71,25 @@
             <gdpr-export />
           </dd>
         </div>
+        <div v-if="showChangePassword" class="account-page-password oc-mb oc-width-1-2@s">
+          <dt class="oc-text-normal oc-text-muted" v-text="$gettext('Password')" />
+          <dd data-testid="password">
+            <oc-button
+              appearance="raw"
+              variation="primary"
+              data-testid="account-page-edit-password-btn"
+              @click="showEditPasswordModal"
+            >
+              <span v-text="$gettext('Set new password')" />
+            </oc-button>
+          </dd>
+        </div>
       </dl>
     </div>
     <div>
-      <h2 class="oc-text-bold oc-mb" v-text="$gettext('Preferences')" />
+      <div class="oc-flex oc-width-1-1">
+        <h2 class="oc-text-bold" v-text="$gettext('Preferences')" />
+      </div>
       <dl class="account-page-preferences oc-flex oc-flex-wrap">
         <div class="account-page-info-language oc-mb oc-width-1-2@s">
           <dt class="oc-text-normal oc-text-muted" v-text="$gettext('Language')" />
@@ -106,10 +104,7 @@
             />
           </dd>
         </div>
-        <div
-          v-if="isSettingsServiceSupported"
-          class="account-page-notification oc-mb oc-width-1-2@s"
-        >
+        <div v-if="showNotifications" class="account-page-notification oc-mb oc-width-1-2@s">
           <dt class="oc-text-normal oc-text-muted" v-text="$gettext('Notifications')" />
           <dd data-testid="notification-mails">
             <oc-checkbox
@@ -121,7 +116,7 @@
             />
           </dd>
         </div>
-        <div class="account-page-view-options oc-mb oc-width-1-2@s">
+        <div v-if="showWebDavDetails" class="account-page-view-options oc-mb oc-width-1-2@s">
           <dt class="oc-text-normal oc-text-muted" v-text="$gettext('View options')" />
           <dd data-testid="view-options">
             <oc-checkbox
@@ -144,6 +139,7 @@ import EditPasswordModal from '../components/EditPasswordModal.vue'
 import { SettingsBundle, LanguageOption, SettingsValue } from '../helpers/settings'
 import { computed, defineComponent, onMounted, unref, ref } from 'vue'
 import {
+  useAuthStore,
   useCapabilityStore,
   useClientService,
   useMessages,
@@ -172,6 +168,7 @@ export default defineComponent({
     const store = useStore()
     const { showMessage, showErrorMessage } = useMessages()
     const userStore = useUserStore()
+    const authStore = useAuthStore()
     const language = useGettext()
     const { $gettext } = language
     const clientService = useClientService()
@@ -185,7 +182,6 @@ export default defineComponent({
     const { dispatchModal } = useModals()
     const spacesStore = useSpacesStore()
     const capabilityStore = useCapabilityStore()
-    const capabilityRefs = storeToRefs(capabilityStore)
 
     // FIXME: Use settings service capability when we have it
     const isSettingsServiceSupported = computed(
@@ -195,11 +191,24 @@ export default defineComponent({
     const { user } = storeToRefs(userStore)
 
     const showGdprExport = computed(() => {
-      return capabilityStore.personalDataExport && spacesStore.personalSpace
+      return (
+        authStore.userContextReady &&
+        capabilityStore.personalDataExport &&
+        spacesStore.personalSpace
+      )
+    })
+    const showChangePassword = computed(() => {
+      return authStore.userContextReady && !capabilityStore.graphUsersChangeSelfPasswordDisabled
     })
+    const showAccountSection = computed(() => authStore.userContextReady)
+    const showWebDavDetails = computed(() => authStore.userContextReady)
+    const showNotifications = computed(
+      () => authStore.userContextReady && unref(isSettingsServiceSupported)
+    )
+    const showLogout = computed(() => authStore.userContextReady && configurationManager.logoutUrl)
 
     const loadValuesListTask = useTask(function* () {
-      if (!unref(isSettingsServiceSupported)) {
+      if (!authStore.userContextReady || !unref(isSettingsServiceSupported)) {
         return
       }
 
@@ -221,7 +230,7 @@ export default defineComponent({
     }).restartable()
 
     const loadAccountBundleTask = useTask(function* () {
-      if (!unref(isSettingsServiceSupported)) {
+      if (!authStore.userContextReady || !unref(isSettingsServiceSupported)) {
         return
       }
 
@@ -241,6 +250,10 @@ export default defineComponent({
     }).restartable()
 
     const loadGraphUserTask = useTask(function* () {
+      if (!authStore.userContextReady) {
+        return
+      }
+
       try {
         const { data } = yield clientService.graphAuthenticated.users.getMe()
         graphUser.value = data
@@ -319,27 +332,29 @@ export default defineComponent({
 
     const updateSelectedLanguage = async (option: LanguageOption) => {
       try {
-        await clientService.graphAuthenticated.users.editMe({
-          preferredLanguage: option.value
-        })
         selectedLanguageValue.value = option
         setCurrentLanguage({
           language,
           languageSetting: option.value
         })
 
-        if (capabilityStore.supportSSE) {
-          ;(clientService.sseAuthenticated as SSEAdapter).updateLanguage(language.current)
-        }
-
-        store.commit('SET_LANGUAGE', language.current)
-        if (spacesStore.personalSpace) {
-          // update personal space name with new translation
-          spacesStore.updateSpaceField({
-            id: spacesStore.personalSpace.id,
-            field: 'name',
-            value: $gettext('Personal')
+        if (authStore.userContextReady) {
+          await clientService.graphAuthenticated.users.editMe({
+            preferredLanguage: option.value
           })
+
+          if (capabilityStore.supportSSE) {
+            ;(clientService.sseAuthenticated as SSEAdapter).updateLanguage(language.current)
+          }
+
+          if (spacesStore.personalSpace) {
+            // update personal space name with new translation
+            spacesStore.updateSpaceField({
+              id: spacesStore.personalSpace.id,
+              field: 'name',
+              value: $gettext('Personal')
+            })
+          }
         }
 
         showMessage({ title: $gettext('Preference saved.') })
@@ -390,7 +405,7 @@ export default defineComponent({
 
       selectedLanguageValue.value = unref(languageOptions)?.find(
         (languageOption) =>
-          languageOption.value === (unref(graphUser).preferredLanguage || language.current)
+          languageOption.value === (unref(graphUser)?.preferredLanguage || language.current)
       )
 
       const disableEmailNotificationsConfiguration = unref(valuesList)?.find(
@@ -417,9 +432,12 @@ export default defineComponent({
       updateDisableEmailNotifications,
       updateViewOptionsWebDavDetails,
       accountEditLink: store.getters.configuration?.options?.accountEditLink,
-      isChangePasswordDisabled: capabilityRefs.graphUsersChangeSelfPasswordDisabled,
+      showLogout,
       showGdprExport,
-      isSettingsServiceSupported,
+      showNotifications,
+      showAccountSection,
+      showChangePassword,
+      showWebDavDetails,
       groupNames,
       user,
       logoutUrl: configurationManager.logoutUrl,
diff --git a/packages/web-runtime/src/router/index.ts b/packages/web-runtime/src/router/index.ts
index 6625ba7e77f..d3d23503465 100644
--- a/packages/web-runtime/src/router/index.ts
+++ b/packages/web-runtime/src/router/index.ts
@@ -77,7 +77,7 @@ const routes = [
     path: '/account',
     name: 'account',
     component: Account,
-    meta: { title: $gettext('Account'), authContext: 'user' }
+    meta: { title: $gettext('Account'), authContext: 'hybrid' }
   }
 ]
 export const router = patchRouter(
diff --git a/packages/web-runtime/tests/unit/components/Topbar/TopBar.spec.ts b/packages/web-runtime/tests/unit/components/Topbar/TopBar.spec.ts
index 29ec2db31b7..8623a17ba79 100644
--- a/packages/web-runtime/tests/unit/components/Topbar/TopBar.spec.ts
+++ b/packages/web-runtime/tests/unit/components/Topbar/TopBar.spec.ts
@@ -31,7 +31,7 @@ describe('Top Bar component', () => {
     })
     it('should not display in an unauthenticated context', () => {
       const { wrapper } = getWrapper({
-        isUserContextReady: false,
+        userContextReady: false,
         capabilities: {
           notifications: { 'ocs-endpoints': ['list', 'get', 'delete'] }
         }
@@ -73,7 +73,7 @@ describe('Top Bar component', () => {
   )
 })
 
-const getWrapper = ({ capabilities = {}, isUserContextReady = true } = {}) => {
+const getWrapper = ({ capabilities = {}, userContextReady = true } = {}) => {
   const mocks = { ...defaultComponentMocks() }
   const storeOptions = { ...defaultStoreMockOptions }
   storeOptions.getters.configuration.mockImplementation(() => ({
@@ -90,7 +90,7 @@ const getWrapper = ({ capabilities = {}, isUserContextReady = true } = {}) => {
         plugins: [
           ...defaultPlugins({
             piniaOptions: {
-              authState: { userContextReady: isUserContextReady },
+              authState: { userContextReady: userContextReady },
               capabilityState: { capabilities }
             }
           }),
diff --git a/packages/web-runtime/tests/unit/components/Topbar/__snapshots__/UserMenu.spec.ts.snap b/packages/web-runtime/tests/unit/components/Topbar/__snapshots__/UserMenu.spec.ts.snap
index 0421c53b7a9..02f4b033b7f 100644
--- a/packages/web-runtime/tests/unit/components/Topbar/__snapshots__/UserMenu.spec.ts.snap
+++ b/packages/web-runtime/tests/unit/components/Topbar/__snapshots__/UserMenu.spec.ts.snap
@@ -3,17 +3,21 @@
 exports[`User Menu component when no quota and email is set the user menu does not contain a quota 1`] = `
 <nav aria-label="Account menu">
   <oc-button-stub appearance="raw" aria-label="My Account" class="oc-topbar-personal" id="_userMenuButton">
-    <avatar-image-stub class="oc-topbar-personal-avatar oc-flex-inline oc-flex-center oc-flex-middle" user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
+    <avatar-image-stub class="oc-topbar-avatar oc-topbar-personal-avatar oc-flex-inline oc-flex-center oc-flex-middle" user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
   </oc-button-stub>
   <oc-drop-stub class="oc-overflow-hidden" close-on-click="" drop-id="account-info-container" mode="click" padding-size="small" toggle="#_userMenuButton">
     <oc-list-stub class="user-menu-list">
+      <li class="profile-info-wrapper oc-pl-s">
+        <avatar-image-stub user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
+        <span class="profile-info-wrapper">
+          <span class="oc-display-block">Albert Einstein</span>
+          <span class="oc-text-small">test@test.de</span>
+        </span>
+      </li>
       <li>
         <oc-button-stub appearance="raw" id="oc-topbar-account-manage" to="[object Object]" type="router-link">
-          <avatar-image-stub user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
-          <span class="profile-info-wrapper">
-            <span class="oc-display-block">Albert Einstein</span>
-            <span class="oc-text-small">test@test.de</span>
-          </span>
+          <oc-icon-stub class="oc-p-xs" fill-type="line" name="settings-4"></oc-icon-stub>
+          <span>Preferences</span>
         </oc-button-stub>
       </li>
       <li>
@@ -38,17 +42,21 @@ exports[`User Menu component when no quota and email is set the user menu does n
 exports[`User Menu component when no quota and no email is set the user menu does not contain a quota 1`] = `
 <nav aria-label="Account menu">
   <oc-button-stub appearance="raw" aria-label="My Account" class="oc-topbar-personal" id="_userMenuButton">
-    <avatar-image-stub class="oc-topbar-personal-avatar oc-flex-inline oc-flex-center oc-flex-middle" user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
+    <avatar-image-stub class="oc-topbar-avatar oc-topbar-personal-avatar oc-flex-inline oc-flex-center oc-flex-middle" user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
   </oc-button-stub>
   <oc-drop-stub class="oc-overflow-hidden" close-on-click="" drop-id="account-info-container" mode="click" padding-size="small" toggle="#_userMenuButton">
     <oc-list-stub class="user-menu-list">
+      <li class="profile-info-wrapper oc-pl-s">
+        <avatar-image-stub user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
+        <span class="profile-info-wrapper oc-py-xs">
+          <span class="oc-display-block">Albert Einstein</span>
+          <!--v-if-->
+        </span>
+      </li>
       <li>
         <oc-button-stub appearance="raw" id="oc-topbar-account-manage" to="[object Object]" type="router-link">
-          <avatar-image-stub user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
-          <span class="profile-info-wrapper oc-py-xs">
-            <span class="oc-display-block">Albert Einstein</span>
-            <!--v-if-->
-          </span>
+          <oc-icon-stub class="oc-p-xs" fill-type="line" name="settings-4"></oc-icon-stub>
+          <span>Preferences</span>
         </oc-button-stub>
       </li>
       <li>
@@ -73,17 +81,21 @@ exports[`User Menu component when no quota and no email is set the user menu doe
 exports[`User Menu component when quota and no email is set renders a navigation without email 1`] = `
 <nav aria-label="Account menu">
   <oc-button-stub appearance="raw" aria-label="My Account" class="oc-topbar-personal" id="_userMenuButton">
-    <avatar-image-stub class="oc-topbar-personal-avatar oc-flex-inline oc-flex-center oc-flex-middle" user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
+    <avatar-image-stub class="oc-topbar-avatar oc-topbar-personal-avatar oc-flex-inline oc-flex-center oc-flex-middle" user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
   </oc-button-stub>
   <oc-drop-stub class="oc-overflow-hidden" close-on-click="" drop-id="account-info-container" mode="click" padding-size="small" toggle="#_userMenuButton">
     <oc-list-stub class="user-menu-list">
+      <li class="profile-info-wrapper oc-pl-s">
+        <avatar-image-stub user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
+        <span class="profile-info-wrapper oc-py-xs">
+          <span class="oc-display-block">Albert Einstein</span>
+          <!--v-if-->
+        </span>
+      </li>
       <li>
         <oc-button-stub appearance="raw" id="oc-topbar-account-manage" to="[object Object]" type="router-link">
-          <avatar-image-stub user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
-          <span class="profile-info-wrapper oc-py-xs">
-            <span class="oc-display-block">Albert Einstein</span>
-            <!--v-if-->
-          </span>
+          <oc-icon-stub class="oc-p-xs" fill-type="line" name="settings-4"></oc-icon-stub>
+          <span>Preferences</span>
         </oc-button-stub>
       </li>
       <li>
@@ -94,10 +106,10 @@ exports[`User Menu component when quota and no email is set renders a navigation
       </li>
       <li class="storage-wrapper oc-pl-s">
         <oc-icon-stub class="oc-p-xs" fill-type="line" name="cloud"></oc-icon-stub>
-        <div class="storage-wrapper-text oc-width-1-1">
+        <div class="oc-width-1-1">
           <p class="oc-my-rm">
             <span class="oc-display-block">Personal storage (30% used)</span>
-            <span class="oc-text-small">300 B of 1 kB used</span>
+            <span class="storage-wrapper-quota oc-text-small">300 B of 1 kB used</span>
           </p>
           <oc-progress-stub max="100" size="small" value="30" variation="primary"></oc-progress-stub>
         </div>
@@ -117,17 +129,21 @@ exports[`User Menu component when quota and no email is set renders a navigation
 exports[`User Menu component when quota is above 80% and below 90% renders a warning quota progress bar 1`] = `
 <nav aria-label="Account menu">
   <oc-button-stub appearance="raw" aria-label="My Account" class="oc-topbar-personal" id="_userMenuButton">
-    <avatar-image-stub class="oc-topbar-personal-avatar oc-flex-inline oc-flex-center oc-flex-middle" user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
+    <avatar-image-stub class="oc-topbar-avatar oc-topbar-personal-avatar oc-flex-inline oc-flex-center oc-flex-middle" user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
   </oc-button-stub>
   <oc-drop-stub class="oc-overflow-hidden" close-on-click="" drop-id="account-info-container" mode="click" padding-size="small" toggle="#_userMenuButton">
     <oc-list-stub class="user-menu-list">
+      <li class="profile-info-wrapper oc-pl-s">
+        <avatar-image-stub user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
+        <span class="profile-info-wrapper">
+          <span class="oc-display-block">Albert Einstein</span>
+          <span class="oc-text-small">test@test.de</span>
+        </span>
+      </li>
       <li>
         <oc-button-stub appearance="raw" id="oc-topbar-account-manage" to="[object Object]" type="router-link">
-          <avatar-image-stub user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
-          <span class="profile-info-wrapper">
-            <span class="oc-display-block">Albert Einstein</span>
-            <span class="oc-text-small">test@test.de</span>
-          </span>
+          <oc-icon-stub class="oc-p-xs" fill-type="line" name="settings-4"></oc-icon-stub>
+          <span>Preferences</span>
         </oc-button-stub>
       </li>
       <li>
@@ -138,10 +154,10 @@ exports[`User Menu component when quota is above 80% and below 90% renders a war
       </li>
       <li class="storage-wrapper oc-pl-s">
         <oc-icon-stub class="oc-p-xs" fill-type="line" name="cloud"></oc-icon-stub>
-        <div class="storage-wrapper-text oc-width-1-1">
+        <div class="oc-width-1-1">
           <p class="oc-my-rm">
             <span class="oc-display-block">Personal storage (81% used)</span>
-            <span class="oc-text-small">810 B of 1 kB used</span>
+            <span class="storage-wrapper-quota oc-text-small">810 B of 1 kB used</span>
           </p>
           <oc-progress-stub max="100" size="small" value="81" variation="warning"></oc-progress-stub>
         </div>
@@ -161,17 +177,21 @@ exports[`User Menu component when quota is above 80% and below 90% renders a war
 exports[`User Menu component when quota is above 90% renders a danger quota progress bar 1`] = `
 <nav aria-label="Account menu">
   <oc-button-stub appearance="raw" aria-label="My Account" class="oc-topbar-personal" id="_userMenuButton">
-    <avatar-image-stub class="oc-topbar-personal-avatar oc-flex-inline oc-flex-center oc-flex-middle" user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
+    <avatar-image-stub class="oc-topbar-avatar oc-topbar-personal-avatar oc-flex-inline oc-flex-center oc-flex-middle" user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
   </oc-button-stub>
   <oc-drop-stub class="oc-overflow-hidden" close-on-click="" drop-id="account-info-container" mode="click" padding-size="small" toggle="#_userMenuButton">
     <oc-list-stub class="user-menu-list">
+      <li class="profile-info-wrapper oc-pl-s">
+        <avatar-image-stub user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
+        <span class="profile-info-wrapper">
+          <span class="oc-display-block">Albert Einstein</span>
+          <span class="oc-text-small">test@test.de</span>
+        </span>
+      </li>
       <li>
         <oc-button-stub appearance="raw" id="oc-topbar-account-manage" to="[object Object]" type="router-link">
-          <avatar-image-stub user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
-          <span class="profile-info-wrapper">
-            <span class="oc-display-block">Albert Einstein</span>
-            <span class="oc-text-small">test@test.de</span>
-          </span>
+          <oc-icon-stub class="oc-p-xs" fill-type="line" name="settings-4"></oc-icon-stub>
+          <span>Preferences</span>
         </oc-button-stub>
       </li>
       <li>
@@ -182,10 +202,10 @@ exports[`User Menu component when quota is above 90% renders a danger quota prog
       </li>
       <li class="storage-wrapper oc-pl-s">
         <oc-icon-stub class="oc-p-xs" fill-type="line" name="cloud"></oc-icon-stub>
-        <div class="storage-wrapper-text oc-width-1-1">
+        <div class="oc-width-1-1">
           <p class="oc-my-rm">
             <span class="oc-display-block">Personal storage (91% used)</span>
-            <span class="oc-text-small">910 B of 1 kB used</span>
+            <span class="storage-wrapper-quota oc-text-small">910 B of 1 kB used</span>
           </p>
           <oc-progress-stub max="100" size="small" value="91" variation="danger"></oc-progress-stub>
         </div>
@@ -205,17 +225,21 @@ exports[`User Menu component when quota is above 90% renders a danger quota prog
 exports[`User Menu component when quota is below 80% renders a primary quota progress bar 1`] = `
 <nav aria-label="Account menu">
   <oc-button-stub appearance="raw" aria-label="My Account" class="oc-topbar-personal" id="_userMenuButton">
-    <avatar-image-stub class="oc-topbar-personal-avatar oc-flex-inline oc-flex-center oc-flex-middle" user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
+    <avatar-image-stub class="oc-topbar-avatar oc-topbar-personal-avatar oc-flex-inline oc-flex-center oc-flex-middle" user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
   </oc-button-stub>
   <oc-drop-stub class="oc-overflow-hidden" close-on-click="" drop-id="account-info-container" mode="click" padding-size="small" toggle="#_userMenuButton">
     <oc-list-stub class="user-menu-list">
+      <li class="profile-info-wrapper oc-pl-s">
+        <avatar-image-stub user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
+        <span class="profile-info-wrapper">
+          <span class="oc-display-block">Albert Einstein</span>
+          <span class="oc-text-small">test@test.de</span>
+        </span>
+      </li>
       <li>
         <oc-button-stub appearance="raw" id="oc-topbar-account-manage" to="[object Object]" type="router-link">
-          <avatar-image-stub user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
-          <span class="profile-info-wrapper">
-            <span class="oc-display-block">Albert Einstein</span>
-            <span class="oc-text-small">test@test.de</span>
-          </span>
+          <oc-icon-stub class="oc-p-xs" fill-type="line" name="settings-4"></oc-icon-stub>
+          <span>Preferences</span>
         </oc-button-stub>
       </li>
       <li>
@@ -226,10 +250,10 @@ exports[`User Menu component when quota is below 80% renders a primary quota pro
       </li>
       <li class="storage-wrapper oc-pl-s">
         <oc-icon-stub class="oc-p-xs" fill-type="line" name="cloud"></oc-icon-stub>
-        <div class="storage-wrapper-text oc-width-1-1">
+        <div class="oc-width-1-1">
           <p class="oc-my-rm">
             <span class="oc-display-block">Personal storage (30% used)</span>
-            <span class="oc-text-small">300 B of 1 kB used</span>
+            <span class="storage-wrapper-quota oc-text-small">300 B of 1 kB used</span>
           </p>
           <oc-progress-stub max="100" size="small" value="30" variation="primary"></oc-progress-stub>
         </div>
@@ -249,17 +273,21 @@ exports[`User Menu component when quota is below 80% renders a primary quota pro
 exports[`User Menu component when quota is not defined renders no percentag of total and no progress bar 1`] = `
 <nav aria-label="Account menu">
   <oc-button-stub appearance="raw" aria-label="My Account" class="oc-topbar-personal" id="_userMenuButton">
-    <avatar-image-stub class="oc-topbar-personal-avatar oc-flex-inline oc-flex-center oc-flex-middle" user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
+    <avatar-image-stub class="oc-topbar-avatar oc-topbar-personal-avatar oc-flex-inline oc-flex-center oc-flex-middle" user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
   </oc-button-stub>
   <oc-drop-stub class="oc-overflow-hidden" close-on-click="" drop-id="account-info-container" mode="click" padding-size="small" toggle="#_userMenuButton">
     <oc-list-stub class="user-menu-list">
+      <li class="profile-info-wrapper oc-pl-s">
+        <avatar-image-stub user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
+        <span class="profile-info-wrapper">
+          <span class="oc-display-block">Albert Einstein</span>
+          <span class="oc-text-small">test@test.de</span>
+        </span>
+      </li>
       <li>
         <oc-button-stub appearance="raw" id="oc-topbar-account-manage" to="[object Object]" type="router-link">
-          <avatar-image-stub user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
-          <span class="profile-info-wrapper">
-            <span class="oc-display-block">Albert Einstein</span>
-            <span class="oc-text-small">test@test.de</span>
-          </span>
+          <oc-icon-stub class="oc-p-xs" fill-type="line" name="settings-4"></oc-icon-stub>
+          <span>Preferences</span>
         </oc-button-stub>
       </li>
       <li>
@@ -270,10 +298,10 @@ exports[`User Menu component when quota is not defined renders no percentag of t
       </li>
       <li class="storage-wrapper oc-pl-s">
         <oc-icon-stub class="oc-p-xs" fill-type="line" name="cloud"></oc-icon-stub>
-        <div class="storage-wrapper-text oc-width-1-1">
+        <div class="oc-width-1-1">
           <p class="oc-my-rm">
             <span class="oc-display-block">Personal storage</span>
-            <span class="oc-text-small">910 B used</span>
+            <span class="storage-wrapper-quota oc-text-small">910 B used</span>
           </p>
           <!--v-if-->
         </div>
@@ -293,17 +321,21 @@ exports[`User Menu component when quota is not defined renders no percentag of t
 exports[`User Menu component when quota is unlimited renders no percentag of total and no progress bar 1`] = `
 <nav aria-label="Account menu">
   <oc-button-stub appearance="raw" aria-label="My Account" class="oc-topbar-personal" id="_userMenuButton">
-    <avatar-image-stub class="oc-topbar-personal-avatar oc-flex-inline oc-flex-center oc-flex-middle" user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
+    <avatar-image-stub class="oc-topbar-avatar oc-topbar-personal-avatar oc-flex-inline oc-flex-center oc-flex-middle" user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
   </oc-button-stub>
   <oc-drop-stub class="oc-overflow-hidden" close-on-click="" drop-id="account-info-container" mode="click" padding-size="small" toggle="#_userMenuButton">
     <oc-list-stub class="user-menu-list">
+      <li class="profile-info-wrapper oc-pl-s">
+        <avatar-image-stub user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
+        <span class="profile-info-wrapper">
+          <span class="oc-display-block">Albert Einstein</span>
+          <span class="oc-text-small">test@test.de</span>
+        </span>
+      </li>
       <li>
         <oc-button-stub appearance="raw" id="oc-topbar-account-manage" to="[object Object]" type="router-link">
-          <avatar-image-stub user-name="Albert Einstein" userid="einstein" width="32"></avatar-image-stub>
-          <span class="profile-info-wrapper">
-            <span class="oc-display-block">Albert Einstein</span>
-            <span class="oc-text-small">test@test.de</span>
-          </span>
+          <oc-icon-stub class="oc-p-xs" fill-type="line" name="settings-4"></oc-icon-stub>
+          <span>Preferences</span>
         </oc-button-stub>
       </li>
       <li>
@@ -314,10 +346,10 @@ exports[`User Menu component when quota is unlimited renders no percentag of tot
       </li>
       <li class="storage-wrapper oc-pl-s">
         <oc-icon-stub class="oc-p-xs" fill-type="line" name="cloud"></oc-icon-stub>
-        <div class="storage-wrapper-text oc-width-1-1">
+        <div class="oc-width-1-1">
           <p class="oc-my-rm">
             <span class="oc-display-block">Personal storage</span>
-            <span class="oc-text-small">300 B used</span>
+            <span class="storage-wrapper-quota oc-text-small">300 B used</span>
           </p>
           <!--v-if-->
         </div>
@@ -337,14 +369,20 @@ exports[`User Menu component when quota is unlimited renders no percentag of tot
 exports[`User Menu component when user is not logged in renders a navigation with login button 1`] = `
 <nav aria-label="Account menu">
   <oc-button-stub appearance="raw" aria-label="My Account" class="oc-topbar-personal" id="_userMenuButton">
-    <div aria-hidden="true" class="oc-topbar-unauthenticated-avatar oc-flex-inline oc-flex-center oc-flex-middle" data-test-item-name="User Menu login" focusable="false">
+    <div aria-hidden="true" class="oc-topbar-avatar oc-topbar-unauthenticated-avatar oc-flex-inline oc-flex-center oc-flex-middle" data-test-item-name="User Menu login" focusable="false">
       <span class="oc-avatar-item" style="--icon-color: var(--oc-color-swatch-brand-default); --width: 32px;">
-        <oc-icon-stub accessiblelabel="" color="" filltype="line" name="user-add" size="small" type="span" variation="passive"></oc-icon-stub>
+        <oc-icon-stub accessiblelabel="" color="" filltype="line" name="user" size="small" type="span" variation="passive"></oc-icon-stub>
       </span>
     </div>
   </oc-button-stub>
   <oc-drop-stub class="oc-overflow-hidden" close-on-click="" drop-id="account-info-container" mode="click" padding-size="small" toggle="#_userMenuButton">
     <oc-list-stub class="user-menu-list">
+      <li>
+        <oc-button-stub appearance="raw" id="oc-topbar-account-manage" to="[object Object]" type="router-link">
+          <oc-icon-stub class="oc-p-xs" fill-type="line" name="settings-4"></oc-icon-stub>
+          <span>Preferences</span>
+        </oc-button-stub>
+      </li>
       <li>
         <oc-button-stub appearance="raw" id="oc-topbar-account-login" to="[object Object]" type="router-link">
           <oc-icon-stub class="oc-p-xs" fill-type="line" name="login-box"></oc-icon-stub>
diff --git a/packages/web-runtime/tests/unit/pages/__snapshots__/account.spec.ts.snap b/packages/web-runtime/tests/unit/pages/__snapshots__/account.spec.ts.snap
index 82499400921..2bf56086824 100644
--- a/packages/web-runtime/tests/unit/pages/__snapshots__/account.spec.ts.snap
+++ b/packages/web-runtime/tests/unit/pages/__snapshots__/account.spec.ts.snap
@@ -1,17 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`account page account information displays basic user information 1`] = `
+exports[`account page account information section displays basic user information 1`] = `
 <dl class="account-page-info oc-flex oc-flex-wrap">
   <div class="account-page-info-username oc-mb oc-width-1-2@s">
     <dt class="oc-text-normal oc-text-muted">Username</dt>
     <dd>some-username</dd>
   </div>
-  <div class="account-page-info-userid">
-    <dt class="oc-text-normal oc-text-muted">User ID</dt>
-    <dd>1</dd>
-  </div>
   <div class="account-page-info-displayname oc-mb oc-width-1-2@s">
-    <dt class="oc-text-normal oc-text-muted">Display name</dt>
+    <dt class="oc-text-normal oc-text-muted">First and last name</dt>
     <dd>some-displayname</dd>
   </div>
   <div class="account-page-info-email oc-mb oc-width-1-2@s">
@@ -31,13 +27,36 @@ exports[`account page account information displays basic user information 1`] =
     </dd>
   </div>
   <!--v-if-->
+  <!--v-if-->
 </dl>
 `;
 
-exports[`account page account information group membership displays group names 1`] = `
+exports[`account page account information section group membership displays group names 1`] = `
 <dd>
   <span>one, two, three</span>
 </dd>
 `;
 
 exports[`account page header section edit url button should be displayed if defined via config 1`] = `<oc-button-stub href="/" target="_blank" type="a" variation="primary"></oc-button-stub>`;
+
+exports[`account page public link context should render a limited view 1`] = `
+<main class="oc-height-1-1 oc-m" id="account">
+  <h1 class="oc-page-title oc-m-rm oc-invisible-sr" id="account-page-title">Some Title</h1>
+  <!--v-if-->
+  <div>
+    <div class="oc-flex oc-width-1-1">
+      <h2 class="oc-text-bold">Preferences</h2>
+    </div>
+    <dl class="account-page-preferences oc-flex oc-flex-wrap">
+      <div class="account-page-info-language oc-mb oc-width-1-2@s">
+        <dt class="oc-text-normal oc-text-muted">Language</dt>
+        <dd class="oc-width-1-3">
+          <oc-select-stub clearable="false" disabled="false" filter="[Function]" fixmessageline="false" getoptionlabel="[Function]" id="oc-select-1" loading="false" multiple="false" optionlabel="label" options="[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]" placeholder="Please choose..." readonly="false" searchable="true"></oc-select-stub>
+        </dd>
+      </div>
+      <!--v-if-->
+      <!--v-if-->
+    </dl>
+  </div>
+</main>
+`;
diff --git a/packages/web-runtime/tests/unit/pages/account.spec.ts b/packages/web-runtime/tests/unit/pages/account.spec.ts
index 1d34de8c7dd..2532cdd45e3 100644
--- a/packages/web-runtime/tests/unit/pages/account.spec.ts
+++ b/packages/web-runtime/tests/unit/pages/account.spec.ts
@@ -9,7 +9,6 @@ import {
   mockAxiosReject
 } from 'web-test-helpers'
 import { mock } from 'jest-mock-extended'
-import { SpaceResource } from '@ownclouders/web-client/src/helpers'
 import { AxiosResponse } from 'axios'
 import { ConfigurationManager, useMessages } from '@ownclouders/web-pkg'
 import { SettingsBundle, SettingsValue } from 'web-runtime/src/helpers/settings'
@@ -45,19 +44,17 @@ jest.mock('@ownclouders/web-pkg', () => ({
 }))
 
 describe('account page', () => {
-  describe('header section', () => {
-    it('renders page title', async () => {
-      const { wrapper } = getWrapper()
-
+  describe('public link context', () => {
+    it('should render a limited view', async () => {
+      const { wrapper } = getWrapper({ isUserContext: false, isPublicLinkContext: true })
       await wrapper.vm.loadAccountBundleTask.last
       await wrapper.vm.loadValuesListTask.last
       await wrapper.vm.loadGraphUserTask.last
-
-      const pageTitle = wrapper.find(selectors.pageTitle)
-      expect(pageTitle.exists()).toBeTruthy()
-      expect(pageTitle.text()).toBe($route.meta.title)
+      expect(wrapper.html()).toMatchSnapshot()
     })
+  })
 
+  describe('header section', () => {
     describe('edit url button', () => {
       it('should be displayed if defined via config', async () => {
         const { wrapper } = getWrapper({
@@ -82,35 +79,9 @@ describe('account page', () => {
         expect(editUrlButton.exists()).toBeFalsy()
       })
     })
-
-    describe('change password button', () => {
-      it('should be displayed if not disabled via capability', async () => {
-        const { wrapper } = getWrapper({
-          capabilities: { graph: { users: { change_password_self_disabled: false } } }
-        })
-
-        await wrapper.vm.loadAccountBundleTask.last
-        await wrapper.vm.loadValuesListTask.last
-        await wrapper.vm.loadGraphUserTask.last
-
-        const editPasswordButton = wrapper.find(selectors.editPasswordButton)
-        expect(editPasswordButton.exists()).toBeTruthy()
-      })
-      it('should not be displayed if disabled via capability', async () => {
-        const { wrapper } = getWrapper({
-          capabilities: { graph: { users: { change_password_self_disabled: true } } }
-        })
-
-        await wrapper.vm.loadAccountBundleTask.last
-        await wrapper.vm.loadValuesListTask.last
-        await wrapper.vm.loadGraphUserTask.last
-
-        const editPasswordButton = wrapper.find(selectors.editPasswordButton)
-        expect(editPasswordButton.exists()).toBeFalsy()
-      })
-    })
   })
-  describe('account information', () => {
+
+  describe('account information section', () => {
     it('displays basic user information', async () => {
       const { wrapper } = getWrapper({
         user: mock<User>({
@@ -155,79 +126,67 @@ describe('account page', () => {
         expect(groupNames.html()).toMatchSnapshot()
       })
     })
-  })
 
-  describe('gdpr export section', () => {
-    it('does show if announced via capabilities and user has a personal space', async () => {
-      const spaces = [mock<SpaceResource>({ driveType: 'personal', isOwner: () => true })]
-      const { wrapper } = getWrapper({
-        spaces,
-        capabilities: { graph: { 'personal-data-export': true } }
-      })
+    describe('Logout from all devices link', () => {
+      it('should render the logout from active devices if logoutUrl is provided', async () => {
+        const { wrapper } = getWrapper()
 
-      await wrapper.vm.loadAccountBundleTask.last
-      await wrapper.vm.loadValuesListTask.last
-      await wrapper.vm.loadGraphUserTask.last
+        await wrapper.vm.loadAccountBundleTask.last
+        await wrapper.vm.loadValuesListTask.last
+        await wrapper.vm.loadGraphUserTask.last
 
-      expect(wrapper.find(selectors.gdprExport).exists()).toBeTruthy()
-    })
-    it('does not show if not announced via capabilities', async () => {
-      const spaces = [mock<SpaceResource>({ driveType: 'personal' })]
-      const { wrapper } = getWrapper({
-        spaces,
-        capabilities: { graph: { 'personal-data-export': false } }
+        expect(wrapper.find('[data-testid="logout"]').exists()).toBe(true)
       })
+      it("shouldn't render the logout from active devices if logoutUrl isn't provided", async () => {
+        const { wrapper } = getWrapper()
 
-      await wrapper.vm.loadAccountBundleTask.last
-      await wrapper.vm.loadValuesListTask.last
-      await wrapper.vm.loadGraphUserTask.last
+        await wrapper.vm.loadAccountBundleTask.last
+        await wrapper.vm.loadValuesListTask.last
+        await wrapper.vm.loadGraphUserTask.last
 
-      expect(wrapper.find(selectors.gdprExport).exists()).toBeFalsy()
-    })
-    it('does not show if user has no personal space', async () => {
-      const spaces = [mock<SpaceResource>({ driveType: 'project' })]
-      const { wrapper } = getWrapper({
-        spaces,
-        capabilities: { graph: { 'personal-data-export': true } }
+        wrapper.vm.logoutUrl = undefined
+        expect(wrapper.find('[data-testid="logout"]').exists()).toBe(true)
       })
+      it('should use url from configuration manager', async () => {
+        const { wrapper } = getWrapper()
 
-      await wrapper.vm.loadAccountBundleTask.last
-      await wrapper.vm.loadValuesListTask.last
-      await wrapper.vm.loadGraphUserTask.last
+        await wrapper.vm.loadAccountBundleTask.last
+        await wrapper.vm.loadValuesListTask.last
+        await wrapper.vm.loadGraphUserTask.last
 
-      expect(wrapper.find(selectors.gdprExport).exists()).toBeFalsy()
+        const logoutButton = wrapper.find(selectors.logoutButton)
+        expect(logoutButton.attributes('href')).toBe('https://account-manager/logout')
+      })
     })
   })
 
-  describe('Logout from all devices link', () => {
-    it('should render the logout from active devices if logoutUrl is provided', async () => {
-      const { wrapper } = getWrapper()
-
-      await wrapper.vm.loadAccountBundleTask.last
-      await wrapper.vm.loadValuesListTask.last
-      await wrapper.vm.loadGraphUserTask.last
-
-      expect(wrapper.find('[data-testid="logout"]').exists()).toBe(true)
-    })
-    it("shouldn't render the logout from active devices if logoutUrl isn't provided", async () => {
-      const { wrapper } = getWrapper()
+  describe('Preferences section', () => {
+    describe('change password button', () => {
+      it('should be displayed if not disabled via capability', async () => {
+        const { wrapper } = getWrapper({
+          capabilities: { graph: { users: { change_password_self_disabled: false } } }
+        })
 
-      await wrapper.vm.loadAccountBundleTask.last
-      await wrapper.vm.loadValuesListTask.last
-      await wrapper.vm.loadGraphUserTask.last
+        await wrapper.vm.loadAccountBundleTask.last
+        await wrapper.vm.loadValuesListTask.last
+        await wrapper.vm.loadGraphUserTask.last
 
-      wrapper.vm.logoutUrl = undefined
-      expect(wrapper.find('[data-testid="logout"]').exists()).toBe(true)
-    })
-    it('should use url from configuration manager', async () => {
-      const { wrapper } = getWrapper()
+        console.log(wrapper.html())
+        const editPasswordButton = wrapper.find(selectors.editPasswordButton)
+        expect(editPasswordButton.exists()).toBeTruthy()
+      })
+      it('should not be displayed if disabled via capability', async () => {
+        const { wrapper } = getWrapper({
+          capabilities: { graph: { users: { change_password_self_disabled: true } } }
+        })
 
-      await wrapper.vm.loadAccountBundleTask.last
-      await wrapper.vm.loadValuesListTask.last
-      await wrapper.vm.loadGraphUserTask.last
+        await wrapper.vm.loadAccountBundleTask.last
+        await wrapper.vm.loadValuesListTask.last
+        await wrapper.vm.loadGraphUserTask.last
 
-      const logoutButton = wrapper.find(selectors.logoutButton)
-      expect(logoutButton.attributes('href')).toBe('https://account-manager/logout')
+        const editPasswordButton = wrapper.find(selectors.editPasswordButton)
+        expect(editPasswordButton.exists()).toBeFalsy()
+      })
     })
   })
 
@@ -315,7 +274,9 @@ function getWrapper({
   user = mock<User>({ memberOf: [] }),
   capabilities = {},
   accountEditLink = undefined,
-  spaces = []
+  spaces = [],
+  isPublicLinkContext = false,
+  isUserContext = true
 } = {}) {
   const storeOptions = { ...defaultStoreMockOptions }
   storeOptions.getters.configuration.mockReturnValue({
@@ -355,6 +316,10 @@ function getWrapper({
           ...defaultPlugins({
             piniaOptions: {
               userState: { user },
+              authState: {
+                userContextReady: isUserContext,
+                publicLinkContextReady: isPublicLinkContext
+              },
               spacesState: { spaces },
               capabilityState: { capabilities }
             }
diff --git a/tests/e2e/cucumber/features/smoke/languageChange.feature b/tests/e2e/cucumber/features/smoke/languageChange.feature
index 0cd13dfaaa1..a47f211dd42 100644
--- a/tests/e2e/cucumber/features/smoke/languageChange.feature
+++ b/tests/e2e/cucumber/features/smoke/languageChange.feature
@@ -18,10 +18,10 @@ Feature: language settings
       | resource      | recipient | type | role     |
       | check_message | Alice     | user | Can edit |
     And "Brian" logs out
-
     And "Alice" logs in
     And "Alice" opens the user menu
     And "Alice" changes the language to "Deutsch - German"
+    Then "Alice" should see the following account page title "Konto"
     When "Alice" logs out
     And "Alice" logs in
     Then "Alice" should see the following notifications
@@ -29,4 +29,20 @@ Feature: language settings
       | Brian Murphy hat check_message mit Ihnen geteilt |
     And "Alice" logs out
 
-
+  Scenario: anonymous user language change
+    When "Alice" logs in
+    And "Alice" opens the "files" app
+    And "Alice" creates the following resources
+      | resource     | type   |
+      | folderPublic | folder |
+    And "Alice" uploads the following resources
+      | resource  | to           |
+      | lorem.txt | folderPublic |
+    And "Alice" creates a public link for the resource "folderPublic" with password "%public%" using the sidebar panel
+    And "Alice" renames the most recently created public link of resource "folderPublic" to "myPublicLink"
+    And "Alice" logs out
+    When "Anonymous" opens the public link "myPublicLink"
+    And "Anonymous" unlocks the public link with password "%public%"
+    And "Anonymous" opens the user menu
+    And "Anonymous" changes the language to "Deutsch - German"
+    Then "Anonymous" should see the following account page title "Konto"
diff --git a/tests/e2e/cucumber/steps/ui/accountMenu.ts b/tests/e2e/cucumber/steps/ui/accountMenu.ts
index 5c5314623ac..bfdb98f17f3 100644
--- a/tests/e2e/cucumber/steps/ui/accountMenu.ts
+++ b/tests/e2e/cucumber/steps/ui/accountMenu.ts
@@ -54,7 +54,18 @@ When(
   async function (this: World, stepUser: string, language: string): Promise<void> {
     const { page } = this.actorsEnvironment.getActor({ key: stepUser })
     const accountObject = new objects.account.Account({ page })
-    const expectedLanguage = await accountObject.changeLanguage(language)
+    const isAnonymousUser = stepUser === 'Anonymous'
+    const expectedLanguage = await accountObject.changeLanguage(language, isAnonymousUser)
     expect(expectedLanguage).toBe(language)
   }
 )
+
+Then(
+  '{string} should see the following account page title {string}',
+  async function (this: World, stepUser: string, title: string): Promise<void> {
+    const { page } = this.actorsEnvironment.getActor({ key: stepUser })
+    const accountObject = new objects.account.Account({ page })
+    const pageTitle = await accountObject.getTitle()
+    expect(pageTitle).toEqual(title)
+  }
+)
diff --git a/tests/e2e/support/objects/account/actions.ts b/tests/e2e/support/objects/account/actions.ts
index 379ce0895d5..605b81899fe 100644
--- a/tests/e2e/support/objects/account/actions.ts
+++ b/tests/e2e/support/objects/account/actions.ts
@@ -1,8 +1,8 @@
 import { Page } from '@playwright/test'
 import util from 'util'
 
-const accountMenuButton = '.oc-topbar-personal-avatar'
-const quotaValue = '.storage-wrapper-text .oc-text-small'
+const accountMenuButton = '.oc-topbar-avatar'
+const quotaValue = '.storage-wrapper-quota'
 const accountManageButton = '#oc-topbar-account-manage'
 const infoValue = '.account-page-info-%s dd'
 const requestExportButton = '[data-testid="request-export-btn"]'
@@ -10,6 +10,7 @@ const downloadExportButton = '[data-testid="download-export-btn"]'
 const languageInput = '[data-testid="language"] .vs__search'
 const languageValueDropDown = `.vs__dropdown-menu :text-is("%s")`
 const languageValue = '[data-testid="language"] .vs__selected'
+const accountPageTitle = '#account-page-title'
 
 export const getQuotaValue = async (args: { page: Page }): Promise<string> => {
   const { page } = args
@@ -79,18 +80,35 @@ export const downloadGdprExport = async (args: { page: Page }): Promise<string>
   return download.suggestedFilename()
 }
 
-export const changeLanguage = async (args: { page: Page; language: string }): Promise<string> => {
-  const { page, language } = args
+export const changeLanguage = async (args: {
+  page: Page
+  language: string
+  isAnonymousUser: boolean
+}): Promise<string> => {
+  const { page, language, isAnonymousUser } = args
   await page.locator(languageInput).waitFor()
+  await page.locator(languageInput).click()
   await page.locator(languageInput).pressSequentially(language)
-  await Promise.all([
-    page.waitForResponse(
-      (res) =>
-        res.url().includes('graph/v1.0/me') &&
-        res.request().method() === 'PATCH' &&
-        res.status() === 200
-    ),
-    page.locator(util.format(languageValueDropDown, language)).press('Enter')
-  ])
+  const promises = []
+
+  if (!isAnonymousUser) {
+    promises.push(
+      page.waitForResponse(
+        (res) =>
+          res.url().includes('graph/v1.0/me') &&
+          res.request().method() === 'PATCH' &&
+          res.status() === 200
+      )
+    )
+  }
+
+  promises.push(page.locator(util.format(languageValueDropDown, language)).press('Enter'))
+  await Promise.all(promises)
+
   return (await page.locator(languageValue).textContent()).trim()
 }
+
+export const getTitle = async (args: { page: Page }): Promise<string> => {
+  const { page } = args
+  return page.locator(accountPageTitle).textContent()
+}
diff --git a/tests/e2e/support/objects/account/index.ts b/tests/e2e/support/objects/account/index.ts
index 4d1a4cfe11e..808d91e6460 100644
--- a/tests/e2e/support/objects/account/index.ts
+++ b/tests/e2e/support/objects/account/index.ts
@@ -28,7 +28,11 @@ export class Account {
     return po.downloadGdprExport({ page: this.#page })
   }
 
-  changeLanguage(language): Promise<string> {
-    return po.changeLanguage({ page: this.#page, language })
+  changeLanguage(language, isAnonymousUser = false): Promise<string> {
+    return po.changeLanguage({ page: this.#page, language, isAnonymousUser })
+  }
+
+  getTitle(): Promise<string> {
+    return po.getTitle({ page: this.#page })
   }
 }