diff --git a/src/DesktopApp.vue b/src/DesktopApp.vue
index 76e96897..36d5486f 100644
--- a/src/DesktopApp.vue
+++ b/src/DesktopApp.vue
@@ -57,7 +57,7 @@ export default {
             if (!self.settingsStore.appSettings.applicationLock) {
                 // refresh token if user is logined
                 self.tokensStore.refreshTokenAndRevokeOldToken().then(response => {
-                    if (response.user && response.user.language) {
+                    if (response.user) {
                         localeDefaultSettings = self.$locale.setLanguage(response.user.language);
                         self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings);
                     }
diff --git a/src/MobileApp.vue b/src/MobileApp.vue
index 5cf4fafb..97d342fd 100644
--- a/src/MobileApp.vue
+++ b/src/MobileApp.vue
@@ -105,7 +105,7 @@ export default {
             if (!self.settingsStore.appSettings.applicationLock) {
                 // refresh token if user is logined
                 self.tokensStore.refreshTokenAndRevokeOldToken().then(response => {
-                    if (response.user && response.user.language) {
+                    if (response.user) {
                         localeDefaultSettings = self.$locale.setLanguage(response.user.language);
                         self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings);
                     }
diff --git a/src/views/desktop/LoginPage.vue b/src/views/desktop/LoginPage.vue
index dfa939ad..631fd6c9 100644
--- a/src/views/desktop/LoginPage.vue
+++ b/src/views/desktop/LoginPage.vue
@@ -254,7 +254,7 @@ export default {
                     return;
                 }
 
-                if (authResponse.user && authResponse.user.language) {
+                if (authResponse.user) {
                     const localeDefaultSettings = self.$locale.setLanguage(authResponse.user.language);
                     self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings);
                 }
@@ -296,7 +296,7 @@ export default {
             }).then(authResponse => {
                 self.verifying = false;
 
-                if (authResponse.user && authResponse.user.language) {
+                if (authResponse.user) {
                     const localeDefaultSettings = self.$locale.setLanguage(authResponse.user.language);
                     self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings);
                 }
diff --git a/src/views/mobile/LoginPage.vue b/src/views/mobile/LoginPage.vue
index 512fa08b..39ac3245 100644
--- a/src/views/mobile/LoginPage.vue
+++ b/src/views/mobile/LoginPage.vue
@@ -210,7 +210,7 @@ export default {
                     return;
                 }
 
-                if (authResponse.user && authResponse.user.language) {
+                if (authResponse.user) {
                     const localeDefaultSettings = self.$locale.setLanguage(authResponse.user.language);
                     self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings);
                 }
@@ -263,7 +263,7 @@ export default {
                 self.verifying = false;
                 self.$hideLoading();
 
-                if (authResponse.user && authResponse.user.language) {
+                if (authResponse.user) {
                     const localeDefaultSettings = self.$locale.setLanguage(authResponse.user.language);
                     self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings);
                 }
diff --git a/src/views/mobile/SignupPage.vue b/src/views/mobile/SignupPage.vue
index 36721775..5f8335cd 100644
--- a/src/views/mobile/SignupPage.vue
+++ b/src/views/mobile/SignupPage.vue
@@ -357,7 +357,7 @@ export default {
                     return;
                 }
 
-                if (response.user && response.user.language) {
+                if (response.user) {
                     const localeDefaultSettings = self.$locale.setLanguage(response.user.language);
                     self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings);
                 }
diff --git a/src/views/mobile/UnlockPage.vue b/src/views/mobile/UnlockPage.vue
index 91af3b98..251d17b6 100644
--- a/src/views/mobile/UnlockPage.vue
+++ b/src/views/mobile/UnlockPage.vue
@@ -126,7 +126,7 @@ export default {
 
                 self.$user.unlockTokenByWebAuthn(id, userName, userSecret);
                 self.tokensStore.refreshTokenAndRevokeOldToken().then(response => {
-                    if (response.user && response.user.language) {
+                    if (response.user) {
                         const localeDefaultSettings = self.$locale.setLanguage(response.user.language);
                         self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings);
                     }
@@ -174,7 +174,7 @@ export default {
             try {
                 self.$user.unlockTokenByPinCode(user.username, pinCode);
                 self.tokensStore.refreshTokenAndRevokeOldToken().then(response => {
-                    if (response.user && response.user.language) {
+                    if (response.user) {
                         const localeDefaultSettings = self.$locale.setLanguage(response.user.language);
                         self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings);
                     }