diff --git a/src/boot/i18n.js b/src/boot/i18n.js
index 837bad936..b23b6d5fd 100644
--- a/src/boot/i18n.js
+++ b/src/boot/i18n.js
@@ -3,7 +3,7 @@ import { createI18n } from 'vue-i18n';
 import messages from 'src/i18n';
 
 const i18n = createI18n({
-    locale: 'en',
+    locale: navigator.language || navigator.userLanguage,
     fallbackLocale: 'en',
     globalInjection: true,
     messages,
diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index 72599d0bc..9174e4d3a 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -15,8 +15,6 @@ const user = state.getUser();
 const token = session.getToken();
 const appName = 'Lilium';
 
-defineEmits(['onToggleRightDrawer']);
-
 onMounted(() => stateStore.setMounted());
 </script>
 
diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
index acbd4a5c0..a8d149d0a 100644
--- a/src/layouts/MainLayout.vue
+++ b/src/layouts/MainLayout.vue
@@ -10,7 +10,7 @@ const stateStore = useStateStore();
 
 <template>
     <q-layout view="hHh LpR fFf">
-        <Navbar @on-toggle-right-drawer="stateStore.toggleRightDrawer()" />
+        <Navbar />
         <router-view></router-view>
         <q-drawer
             v-model="stateStore.rightDrawer"