diff --git a/app/app.vue b/app/app.vue
index 90350df..b138619 100644
--- a/app/app.vue
+++ b/app/app.vue
@@ -32,7 +32,6 @@ useSeoMeta({
     <NuxtLayout>
       <NuxtPage />
     </NuxtLayout>
-    <modal-login />
     <layout-confirm />
     <u-notifications>
       <template #title="{ title }">
diff --git a/app/components/header/HeaderAuth.vue b/app/components/header/HeaderAuth.vue
index 53eb1eb..ef624d5 100644
--- a/app/components/header/HeaderAuth.vue
+++ b/app/components/header/HeaderAuth.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const { user } = await useUserSession()
+const { user, clear } = await useUserSession()
 const items = [
   [
     {
@@ -27,7 +27,11 @@ const items = [
     {
       label: 'Logout',
       icon: 'i-mdi-logout',
-      click: () => useApi().logout(),
+      click: async () => {
+        clear()
+        useApi().fetch('/api/logout')
+        await navigateTo('/')
+      },
       shortcuts: ['L'],
     },
   ],
diff --git a/app/components/layout/LayoutLogin.vue b/app/components/layout/LayoutLogin.vue
index 9510bc2..2eb319d 100644
--- a/app/components/layout/LayoutLogin.vue
+++ b/app/components/layout/LayoutLogin.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
-const emit = defineEmits(['login'])
+import type { User } from '~/types/models'
+
+const emit = defineEmits(['loggedin'])
 const loading = ref(false)
 interface Provider {
   name: string
@@ -57,9 +59,9 @@ function login(name: string): void {
 
 async function handleMessage(evt: { data: { user: User, token: string } }) {
   useApi().success('logged in')
-  emit('login')
+  emit('loggedin')
   await refreshNuxtData()
-  await navigateTo('/home')
+  setTimeout(async () => await navigateTo('/home'), 500)
 }
 
 function messageHandler(add: boolean): void {
diff --git a/app/components/modal/ModalLogin.vue b/app/components/modal/ModalLogin.vue
index c6a6b84..c8509c7 100644
--- a/app/components/modal/ModalLogin.vue
+++ b/app/components/modal/ModalLogin.vue
@@ -1,11 +1,16 @@
 <script setup lang="ts">
+const emit = defineEmits(['loggedin'])
 const { authModal } = useAuth()
+const loggedin = () => {
+  emit('loggedin')
+  authModal.value = false
+}
 </script>
 
 <template>
   <u-modal v-model="authModal" :ui="{ width: 'w-full sm:max-w-sm' }" @close="authModal = false">
     <div class="py-8 max-w-xs w-full mx-auto">
-      <layout-login @login="authModal = false" />
+      <layout-login @loggedin="loggedin" />
     </div>
   </u-modal>
 </template>
diff --git a/app/components/token/TokenCard.vue b/app/components/token/TokenCard.vue
index 93a9108..ae1561e 100644
--- a/app/components/token/TokenCard.vue
+++ b/app/components/token/TokenCard.vue
@@ -14,7 +14,6 @@ const remove = () => confirm('Delete Token', 'Are you sure you want to delete th
   })
   emit('reload')
   success(meta.detail)
-  await useApi().checkUser()
 })
 </script>
 
diff --git a/app/composables/api.ts b/app/composables/api.ts
index a06c040..3a2a942 100644
--- a/app/composables/api.ts
+++ b/app/composables/api.ts
@@ -22,7 +22,6 @@ export const useApi = () => {
         alert(`Field: ${issue.path} Error: ${issue.message}`), 100 * (index + 1)),
       )
   }
-
   const fetch = <T>(
     url: string | (() => string),
     options?: Omit<UseFetchOptions<T>, 'default'> & { default: () => T | Ref<T> },
@@ -50,15 +49,9 @@ export const useApi = () => {
     return { fetch }
   }
 
-  const logout = async () => {
-    await fetch('/api/logout')
-    await navigateTo('/')
-  }
-
   return {
     fetch,
     setForm,
-    logout,
     success,
   }
 }
diff --git a/app/pages/index.vue b/app/pages/index.vue
index fb2bf8b..c7aeaa6 100644
--- a/app/pages/index.vue
+++ b/app/pages/index.vue
@@ -1,7 +1,10 @@
 <script setup lang="ts">
 const { authModal } = useAuth()
 definePageMeta({ layout: 'bare' })
-const { user } = useApi()
+const { user } = useUserSession()
+const detected = () => {
+  if (import.meta.client) document.location.href = '/home'
+}
 </script>
 
 <template>
@@ -15,6 +18,7 @@ const { user } = useApi()
         <u-skeleton class="w-28 h-10" />
       </template>
     </client-only>
+    <modal-login @loggedin="detected" />
   </div>
 </template>
 
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 16b7650..dfa4044 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -10,6 +10,11 @@ export default defineNuxtConfig({
     '@nuxt/image',
     'nuxt-auth-utils',
   ],
+  runtimeConfig: {
+    session: {
+      maxAge: 60 * 60 * 24 * 365, // 1 year
+    },
+  },
   eslint: {
     config: {
       standalone: false,