diff --git a/resources/js/App.vue b/resources/js/App.vue
index fcc4ab69..7fb2533d 100644
--- a/resources/js/App.vue
+++ b/resources/js/App.vue
@@ -1,12 +1,36 @@
 <script setup>
     import { RouterView } from 'vue-router'
+    import { Kicker } from '@2fauth/ui'
 
     const { t } = useI18n()
+    const { language } = useNavigatorLanguage()
     const route = useRoute()
-    const kickUser = ref(null)
+    const user = inject('userStore')
+
+    const mustKick = ref(false)
     const kickUserAfter = ref(null)
     const isProtectedRoute = ref(route.meta.watchedByKicker)
 
+    mustKick.value = user.isAuthenticated
+    kickUserAfter.value = parseInt(user.preferences.kickUserAfter)
+
+    watch(
+        () => user.preferences.kickUserAfter,
+        () => {
+            kickUserAfter.value = parseInt(user.preferences.kickUserAfter)
+        }
+    )
+    watch(
+        () => user.isAuthenticated,
+        () => {
+            mustKick.value = user.isAuthenticated
+        }
+    )
+
+    watch(language, () => {
+        user.applyLanguage()
+    })
+
     watch(
         () => route.name,
         () => {
@@ -14,33 +38,6 @@
         }
     )
 
-    // const kickInactiveUser = computed(() => kickUser && kickUserAfter.value > 0 && isProtectedRoute.value)
-
-    onBeforeMount(async () => {
-        const { useUserStore } = await import('./stores/user.js')
-        const { language } = useNavigatorLanguage()
-        const user = useUserStore()
-
-        kickUserAfter.value = parseInt(user.preferences.kickUserAfter)
-        kickUser.value = user.isAuthenticated
-
-        watch(
-            () => user.preferences.kickUserAfter,
-            () => {
-                kickUserAfter.value = parseInt(user.preferences.kickUserAfter)
-            }
-        )
-        watch(
-            () => user.isAuthenticated,
-            () => {
-                kickUser.value = user.isAuthenticated
-            }
-        )
-        watch(language, () => {
-            user.applyLanguage()
-        })
-    })
-
     router.afterEach((to, from) => {
         to.meta.title = t('title.' + to.name)
         document.title = to.meta.title
@@ -61,5 +58,9 @@
     <main class="main-section">
         <RouterView />
     </main>
-    <kicker v-if="kickUser && kickUserAfter > 0 && isProtectedRoute" :kickAfter="kickUserAfter"></kicker>
+    <Kicker
+        v-if="mustKick && kickUserAfter > 0 && isProtectedRoute"
+        :kickAfter="kickUserAfter"
+        @kicked="() => user.logout({ kicked: true})"
+    />
 </template>
\ No newline at end of file
diff --git a/resources/js/app.js b/resources/js/app.js
index 3546b5f9..bf1ba274 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -40,8 +40,6 @@ app.use(router)
 app.use(Notifications)
 
 // Global components registration
-import Kicker           from '@/components/Kicker.vue'
-
 import {
     FormField,
     FormPasswordField,
@@ -76,7 +74,6 @@ app
     .component('FormToggle', FormToggle)
     .component('FormCheckbox', FormCheckbox)
     .component('FormButtons', FormButtons)
-    .component('Kicker', Kicker)
 
 // Global error handling
 // import { useNotify } from '@2fauth/ui'
@@ -90,9 +87,6 @@ app
 // Helpers
 // app.config.globalProperties.$helpers = helpers
 
-// App mounting
-app.mount('#app')
-
 // App inject for footer
 // TODO : Try to avoid those global injection
 import { useUserStore } from '@/stores/user'
@@ -105,3 +99,6 @@ user.applyUserPrefs()
 
 app.provide('userStore', user)
 app.provide('appSettingsStore', appSettings)
+
+// App mounting
+app.mount('#app')
\ No newline at end of file
diff --git a/resources/js/components/Kicker.vue b/resources/js/components/Kicker.vue
deleted file mode 100644
index fddca3bc..00000000
--- a/resources/js/components/Kicker.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-<script setup>
-    import { useUserStore } from '@/stores/user'
-
-    const user = useUserStore()
-    const events = ref(['mousedown', 'scroll', 'keypress'])
-    const logoutTimer = ref(null)
-    // const elapsed = ref(0)
-    // const counter = ref(null)
-
-    const props = defineProps({
-        kickAfter: {
-            type: Number,
-            required: true
-        },
-    })
-
-    watch(
-        () => props.kickAfter,
-        () => {
-            restartTimer()
-        }
-    )
-
-    onMounted(() => {
-        events.value.forEach(function (event) {
-            window.addEventListener(event, restartTimer)
-        }, this)
-
-        startTimer()
-    })
-
-    onUnmounted(() => {
-        events.value.forEach(function (event) {
-            window.removeEventListener(event, restartTimer)
-        }, this)
-
-        stopTimer()
-    })
-
-    function startTimer() {
-        logoutTimer.value = setTimeout(logoutUser, props.kickAfter * 60 * 1000)
-        // counter.value = setInterval(() => {
-        //     elapsed.value += 1
-        //     console.log(elapsed.value + '/' + props.kickAfter * 60)
-        // }, 1000)
-    }
-
-    // Triggers the user logout
-    function logoutUser() {
-        clearTimeout(logoutTimer.value)
-        user.logout({ kicked: true})
-    }
-
-    // Restarts the timer
-    function restartTimer() {
-        stopTimer()
-        startTimer()
-    }
-
-    // Stops the timer
-    function stopTimer() {
-        clearTimeout(logoutTimer.value)
-        // elapsed.value = 0
-        // clearInterval(counter.value)
-    }
-</script>
-
-<template>
-
-</template>
\ No newline at end of file
diff --git a/resources/js/stores/user.js b/resources/js/stores/user.js
index 67fd4a4f..a2e3a68b 100644
--- a/resources/js/stores/user.js
+++ b/resources/js/stores/user.js
@@ -78,7 +78,7 @@ export const useUserStore = defineStore({
                 authService.logout({ returnError: true }).then(() => {
                     if (kicked) {
                         notify.clear()
-                        notify.warn({ text: t('message.auth.autolock_triggered_punchline'), duration:-1 })
+                        notify.warn({ text: this.$i18n.global.t('message.auth.autolock_triggered_punchline'), duration:-1 })
                     }
                     this.tossOut()
                 })
@@ -163,7 +163,7 @@ export const useUserStore = defineStore({
             })
             .catch(error => {
                 const notify = useNotify()
-                notify.alert({ text: t('error.data_cannot_be_refreshed_from_server') })
+                notify.alert({ text: this.$i18n.global.t('error.data_cannot_be_refreshed_from_server') })
             })
         }