diff --git a/packages/web-app-ocm/src/index.ts b/packages/web-app-ocm/src/index.ts
index 2c7522e976d..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, useStore } 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,7 +27,7 @@ export default defineWebApplication({
   setup() {
     const { $gettext } = useGettext()
     const router = useRouter()
-    const store = useStore()
+    const userStore = useUserStore()
 
     const appInfo = {
       name: $gettext('ScienceMesh'),
@@ -37,7 +37,7 @@ export default defineWebApplication({
       isFileEditor: false,
       applicationMenu: {
         enabled: () => {
-          return !!store.getters?.user?.id
+          return !!userStore.user
         }
       }
     }
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 e77765f40c6..f4224072b9b 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,6 +1,6 @@
 // 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>
@@ -35,10 +35,32 @@ exports[`account page account information displays basic user information 1`] =
 </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 }
             }