diff --git a/src/boot/i18n.js b/src/boot/i18n.js
index b23b6d5fd..85d0772a3 100644
--- a/src/boot/i18n.js
+++ b/src/boot/i18n.js
@@ -1,9 +1,11 @@
 import { boot } from 'quasar/wrappers';
 import { createI18n } from 'vue-i18n';
 import messages from 'src/i18n';
+import { useState } from 'src/composables/useState';
+const user = useState().getUser();
 
 const i18n = createI18n({
-    locale: navigator.language || navigator.userLanguage,
+    locale: user.value.lang || navigator.language || navigator.userLanguage,
     fallbackLocale: 'en',
     globalInjection: true,
     messages,
diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index 810f63044..a0ef73a1f 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -87,10 +87,10 @@ async function saveDarkMode(value) {
 async function saveLanguage(value) {
     const query = `/VnUsers/${user.value.id}`;
     try {
-        await axios.patch(query, {
-            lang: value,
-        });
+        await axios.patch(query, { lang: value });
+
         user.value.lang = value;
+        useState().setUser(user.value);
         onDataSaved();
     } catch (error) {
         onDataError();