diff --git a/src/stores/index.js b/src/stores/index.js
index c3e6de41..e59fd971 100644
--- a/src/stores/index.js
+++ b/src/stores/index.js
@@ -43,7 +43,7 @@ export const useRootStore = defineStore('root', {
 
             if (resetUserInfoAndSettings) {
                 const userStore = useUserStore();
-                userStore.resetUserInfo();
+                userStore.resetUserBasicInfo();
             }
         },
         authorize({ loginName, password }) {
@@ -81,7 +81,7 @@ export const useRootStore = defineStore('root', {
 
                     if (data.result.user && isObject(data.result.user)) {
                         const userStore = useUserStore();
-                        userStore.storeUserInfo(data.result.user);
+                        userStore.storeUserBasicInfo(data.result.user);
                     }
 
                     resolve(data.result);
@@ -142,7 +142,7 @@ export const useRootStore = defineStore('root', {
 
                     if (data.result.user && isObject(data.result.user)) {
                         const userStore = useUserStore();
-                        userStore.storeUserInfo(data.result.user);
+                        userStore.storeUserBasicInfo(data.result.user);
                     }
 
                     resolve(data.result);
@@ -192,7 +192,7 @@ export const useRootStore = defineStore('root', {
 
                     if (data.result.user && isObject(data.result.user)) {
                         const userStore = useUserStore();
-                        userStore.storeUserInfo(data.result.user);
+                        userStore.storeUserBasicInfo(data.result.user);
                     }
 
                     resolve(data.result);
@@ -267,7 +267,7 @@ export const useRootStore = defineStore('root', {
 
                     if (data.result.user && isObject(data.result.user)) {
                         const userStore = useUserStore();
-                        userStore.storeUserInfo(data.result.user);
+                        userStore.storeUserBasicInfo(data.result.user);
                     }
 
                     resolve(data.result);
@@ -401,7 +401,7 @@ export const useRootStore = defineStore('root', {
 
                     if (data.result.user && isObject(data.result.user)) {
                         const userStore = useUserStore();
-                        userStore.storeUserInfo(data.result.user);
+                        userStore.storeUserBasicInfo(data.result.user);
                     }
 
                     const accountsStore = useAccountsStore();
diff --git a/src/stores/token.js b/src/stores/token.js
index 59786d23..a1dd1934 100644
--- a/src/stores/token.js
+++ b/src/stores/token.js
@@ -42,7 +42,7 @@ export const useTokensStore = defineStore('tokens', {
 
                     if (data && data.success && data.result && data.result.user && isObject(data.result.user)) {
                         const userStore = useUserStore();
-                        userStore.storeUserInfo(data.result.user);
+                        userStore.storeUserBasicInfo(data.result.user);
                     }
 
                     if (data && data.success && data.result && data.result.newToken) {
diff --git a/src/stores/user.js b/src/stores/user.js
index fb8eeee1..91c6a5f4 100644
--- a/src/stores/user.js
+++ b/src/stores/user.js
@@ -9,73 +9,73 @@ import { isNumber } from '@/lib/common.js';
 
 export const useUserStore = defineStore('user', {
     state: () => ({
-        currentUserInfo: userState.getUserInfo()
+        currentUserBasicInfo: userState.getUserInfo()
     }),
     getters: {
         currentUserNickname(state) {
-            const userInfo = state.currentUserInfo || {};
+            const userInfo = state.currentUserBasicInfo || {};
             return userInfo.nickname || userInfo.username || null;
         },
         currentUserAvatar(state) {
-            const userInfo = state.currentUserInfo || {};
+            const userInfo = state.currentUserBasicInfo || {};
             return userInfo.avatar || null;
         },
         currentUserDefaultAccountId(state) {
-            const userInfo = state.currentUserInfo || {};
+            const userInfo = state.currentUserBasicInfo || {};
             return userInfo.defaultAccountId || '';
         },
         currentUserLanguage(state) {
-            const userInfo = state.currentUserInfo || {};
+            const userInfo = state.currentUserBasicInfo || {};
             return userInfo.language;
         },
         currentUserDefaultCurrency(state) {
             const settingsStore = useSettingsStore();
-            const userInfo = state.currentUserInfo || {};
+            const userInfo = state.currentUserBasicInfo || {};
             return userInfo.defaultCurrency || settingsStore.localeDefaultSettings.currency;
         },
         currentUserFirstDayOfWeek(state) {
             const settingsStore = useSettingsStore();
-            const userInfo = state.currentUserInfo || {};
+            const userInfo = state.currentUserBasicInfo || {};
             return isNumber(userInfo.firstDayOfWeek) ? userInfo.firstDayOfWeek : settingsStore.localeDefaultSettings.firstDayOfWeek;
         },
         currentUserLongDateFormat(state) {
-            const userInfo = state.currentUserInfo || {};
+            const userInfo = state.currentUserBasicInfo || {};
             return userInfo.longDateFormat;
         },
         currentUserShortDateFormat(state) {
-            const userInfo = state.currentUserInfo || {};
+            const userInfo = state.currentUserBasicInfo || {};
             return userInfo.shortDateFormat;
         },
         currentUserLongTimeFormat(state) {
-            const userInfo = state.currentUserInfo || {};
+            const userInfo = state.currentUserBasicInfo || {};
             return userInfo.longTimeFormat;
         },
         currentUserShortTimeFormat(state) {
-            const userInfo = state.currentUserInfo || {};
+            const userInfo = state.currentUserBasicInfo || {};
             return userInfo.shortTimeFormat;
         },
         currentUserDecimalSeparator(state) {
-            const userInfo = state.currentUserInfo || {};
+            const userInfo = state.currentUserBasicInfo || {};
             return userInfo.decimalSeparator;
         },
         currentUserDigitGroupingSymbol(state) {
-            const userInfo = state.currentUserInfo || {};
+            const userInfo = state.currentUserBasicInfo || {};
             return userInfo.digitGroupingSymbol;
         },
         currentUserDigitGrouping(state) {
-            const userInfo = state.currentUserInfo || {};
+            const userInfo = state.currentUserBasicInfo || {};
             return userInfo.digitGrouping;
         },
         currentUserCurrencyDisplayType(state) {
-            const userInfo = state.currentUserInfo || {};
+            const userInfo = state.currentUserBasicInfo || {};
             return userInfo.currencyDisplayType;
         },
         currentUserExpenseAmountColor(state) {
-            const userInfo = state.currentUserInfo || {};
+            const userInfo = state.currentUserBasicInfo || {};
             return userInfo.expenseAmountColor;
         },
         currentUserIncomeAmountColor(state) {
-            const userInfo = state.currentUserInfo || {};
+            const userInfo = state.currentUserBasicInfo || {};
             return userInfo.incomeAmountColor;
         }
     },
@@ -94,12 +94,12 @@ export const useUserStore = defineStore('user', {
                 firstDayOfWeek: settingsStore.localeDefaultSettings.firstDayOfWeek,
             };
         },
-        storeUserInfo(userInfo) {
-            this.currentUserInfo = userInfo;
+        storeUserBasicInfo(userInfo) {
+            this.currentUserBasicInfo = userInfo;
             userState.updateUserInfo(userInfo);
         },
-        resetUserInfo() {
-            this.currentUserInfo = null;
+        resetUserBasicInfo() {
+            this.currentUserBasicInfo = null;
             userState.clearUserInfo();
         },
         getCurrentUserProfile() {
diff --git a/src/views/desktop/UnlockPage.vue b/src/views/desktop/UnlockPage.vue
index 70ad3231..4190ff8f 100644
--- a/src/views/desktop/UnlockPage.vue
+++ b/src/views/desktop/UnlockPage.vue
@@ -175,7 +175,7 @@ export default {
             self.verifyingByWebAuthn = true;
 
             webauthn.verifyCredential(
-                self.userStore.currentUserInfo,
+                self.userStore.currentUserBasicInfo,
                 self.$user.getWebAuthnCredentialId()
             ).then(({ id, userName, userSecret }) => {
                 self.verifyingByWebAuthn = false;
@@ -217,7 +217,7 @@ export default {
                 return;
             }
 
-            const user = self.userStore.currentUserInfo;
+            const user = self.userStore.currentUserBasicInfo;
 
             if (!user || !user.username) {
                 self.$refs.snackbar.showMessage('An error occurred');
diff --git a/src/views/desktop/app/settings/tabs/AppLockSettingTab.vue b/src/views/desktop/app/settings/tabs/AppLockSettingTab.vue
index 0e6faae0..f53f5010 100644
--- a/src/views/desktop/app/settings/tabs/AppLockSettingTab.vue
+++ b/src/views/desktop/app/settings/tabs/AppLockSettingTab.vue
@@ -107,7 +107,7 @@ export default {
 
                 webauthn.registerCredential(
                     self.$user.getUserAppLockState(),
-                    self.userStore.currentUserInfo,
+                    self.userStore.currentUserBasicInfo,
                 ).then(({ id }) => {
                     self.enablingWebAuthn = false;
 
@@ -158,7 +158,7 @@ export default {
                 return;
             }
 
-            const user = this.userStore.currentUserInfo;
+            const user = this.userStore.currentUserBasicInfo;
 
             if (!user || !user.username) {
                 this.pinCode = '';
diff --git a/src/views/mobile/ApplicationLockPage.vue b/src/views/mobile/ApplicationLockPage.vue
index 020acbbe..e2126067 100644
--- a/src/views/mobile/ApplicationLockPage.vue
+++ b/src/views/mobile/ApplicationLockPage.vue
@@ -81,7 +81,7 @@ export default {
 
                 webauthn.registerCredential(
                     self.$user.getUserAppLockState(),
-                    self.userStore.currentUserInfo,
+                    self.userStore.currentUserBasicInfo,
                 ).then(({ id }) => {
                     self.$hideLoading();
 
@@ -136,7 +136,7 @@ export default {
                 return;
             }
 
-            const user = this.userStore.currentUserInfo;
+            const user = this.userStore.currentUserBasicInfo;
 
             if (!user || !user.username) {
                 this.$alert('An error occurred');
diff --git a/src/views/mobile/UnlockPage.vue b/src/views/mobile/UnlockPage.vue
index 7c97c004..c653f18c 100644
--- a/src/views/mobile/UnlockPage.vue
+++ b/src/views/mobile/UnlockPage.vue
@@ -128,7 +128,7 @@ export default {
             self.$showLoading();
 
             webauthn.verifyCredential(
-                self.userStore.currentUserInfo,
+                self.userStore.currentUserBasicInfo,
                 self.$user.getWebAuthnCredentialId()
             ).then(({ id, userName, userSecret }) => {
                 self.$hideLoading();
@@ -175,7 +175,7 @@ export default {
             }
 
             const router = self.f7router;
-            const user = self.userStore.currentUserInfo;
+            const user = self.userStore.currentUserBasicInfo;
 
             if (!user || !user.username) {
                 self.$alert('An error occurred');