diff --git a/src/layouts/default.vue b/src/layouts/default.vue
index 90c089a..bf6e9b0 100644
--- a/src/layouts/default.vue
+++ b/src/layouts/default.vue
@@ -1,6 +1,11 @@
 <script setup lang="ts">
 const appConfig = useAppConfig()
 const getColor = computed(() => appConfig.ui.primary)
+
+const router = useRouter()
+router.afterEach((route) => {
+  useCookie('last-route', { path: '/', default: () => '/' }).value = route.fullPath
+})
 </script>
 
 <template>
diff --git a/src/server/routes/auth/github.get.ts b/src/server/routes/auth/github.get.ts
index cb56d33..1ad7cf6 100644
--- a/src/server/routes/auth/github.get.ts
+++ b/src/server/routes/auth/github.get.ts
@@ -10,7 +10,7 @@ export default oauth.githubEventHandler({
         username: String(user.name).trim(),
       },
     })
-    return sendRedirect(event, '/')
+    return sendRedirect(event, getCookie(event, 'last-route') || '/')
   },
   onError(error: any) {
     console.error('GitHub OAuth error:', error)
diff --git a/src/server/routes/auth/google.get.ts b/src/server/routes/auth/google.get.ts
index 6c7ef1d..e4c8c85 100644
--- a/src/server/routes/auth/google.get.ts
+++ b/src/server/routes/auth/google.get.ts
@@ -1,7 +1,4 @@
 export default oauth.googleEventHandler({
-  config: {
-    redirectUrl: '/talents',
-  },
   async onSuccess(event: any, { user }: any) {
     await setUserSession(event, {
       user: {
@@ -10,6 +7,9 @@ export default oauth.googleEventHandler({
         username: String(user.name).trim(),
       },
     })
-    return sendRedirect(event, '/')
+    return sendRedirect(event, getCookie(event, 'last-route') || '/')
+  },
+  onError(error: any) {
+    console.error('Google OAuth error:', error)
   },
 })