diff --git a/packages/nc-gui/components/account/Profile.vue b/packages/nc-gui/components/account/Profile.vue
index 90e0572281..dd7f9f727a 100644
--- a/packages/nc-gui/components/account/Profile.vue
+++ b/packages/nc-gui/components/account/Profile.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-const { currentUser } = storeToRefs(useUsers())
+const { user } = useGlobal()
 
 const isErrored = ref(false)
 const isTitleUpdating = ref(false)
@@ -38,15 +38,15 @@ const onSubmit = async () => {
   }
 }
 
-const email = computed(() => currentUser.value?.email)
+const email = computed(() => user.value?.email)
 
 watch(
-  () => currentUser.value?.display_name,
+  () => user.value?.display_name,
   () => {
-    if (!currentUser.value?.display_name) return
+    if (!user.value?.display_name) return
 
-    form.value.title = currentUser.value.display_name
-    form.value.email = currentUser.value.email
+    form.value.title = user.value.display_name
+    form.value.email = user.value.email
   },
   {
     immediate: true,
@@ -99,7 +99,7 @@ watch(
               <NcButton
                 type="primary"
                 html-type="submit"
-                :disabled="isErrored || (form.title && form.title === currentUser?.display_name)"
+                :disabled="isErrored || (form.title && form.title === user?.display_name)"
                 :loading="isTitleUpdating"
                 data-testid="nc-account-settings-save"
                 @click="onSubmit"
diff --git a/packages/nc-gui/components/general/UserIcon.vue b/packages/nc-gui/components/general/UserIcon.vue
index 9af274d81a..d0356e8534 100644
--- a/packages/nc-gui/components/general/UserIcon.vue
+++ b/packages/nc-gui/components/general/UserIcon.vue
@@ -3,15 +3,15 @@ const props = defineProps<{
   size?: 'small' | 'medium' | 'large' | 'xlarge'
 }>()
 
-const { currentUser } = storeToRefs(useUsers())
+const { user } = useGlobal()
 
-const backgroundColor = computed(() => (currentUser.value?.id ? stringToColour(currentUser.value?.id) : '#FFFFFF'))
+const backgroundColor = computed(() => (user.value?.id ? stringToColour(user.value?.id) : '#FFFFFF'))
 
 const size = computed(() => props.size || 'medium')
 
-const displayName = computed(() => currentUser.value?.display_name ?? '')
+const displayName = computed(() => user.value?.display_name ?? '')
 
-const email = computed(() => currentUser.value?.email ?? '')
+const email = computed(() => user.value?.email ?? '')
 
 const usernameInitials = computed(() => {
   const displayNameSplit = displayName.value?.split(' ').filter((name) => name) ?? []
@@ -23,7 +23,7 @@ const usernameInitials = computed(() => {
       return displayName.value.slice(0, 2)
     }
   } else {
-    return email.value.slice(0, 2)
+    return email.value?.split('@')[0].slice(0, 2)
   }
 })
 </script>
diff --git a/packages/nc-gui/store/users.ts b/packages/nc-gui/store/users.ts
index ae04f20888..208d9e6ccf 100644
--- a/packages/nc-gui/store/users.ts
+++ b/packages/nc-gui/store/users.ts
@@ -4,13 +4,6 @@ export const useUsers = defineStore('userStore', () => {
   const { api } = useApi()
   const { user } = useGlobal()
 
-  const currentUser = computed({
-    get: () => user.value,
-    set: (value) => {
-      user.value = value
-    },
-  })
-
   const updateUserProfile = async ({
     attrs,
   }: {
@@ -56,7 +49,6 @@ export const useUsers = defineStore('userStore', () => {
   return {
     loadCurrentUser,
     updateUserProfile,
-    currentUser,
   }
 })