diff --git a/app/[locale]/login/page.tsx b/app/[locale]/login/page.tsx
index 608268d..ed40436 100644
--- a/app/[locale]/login/page.tsx
+++ b/app/[locale]/login/page.tsx
@@ -156,6 +156,7 @@ export default async function Login({
       return redirect(`/${localeString}/login?message=${error.message}`)
     }
 
+    console.log("2..................Redirecting with locale:", localeString)
     return redirect(`/${localeString}/setup`)
 
     // USE IF YOU WANT TO SEND EMAIL VERIFICATION, ALSO CHANGE TOML FILE
diff --git a/app/[locale]/login/password/page.tsx b/app/[locale]/login/password/page.tsx
index e00cca3..a8e5f42 100644
--- a/app/[locale]/login/password/page.tsx
+++ b/app/[locale]/login/password/page.tsx
@@ -15,7 +15,10 @@ export default function ChangePasswordPage() {
       const session = (await supabase.auth.getSession()).data.session
 
       if (!session) {
-        router.push("/login")
+        // 提取当前路径中的 locale 部分
+        const pathname = router.pathname
+        const locale = pathname.split("/")[1] || "en"  // 获取路径中的 locale 部分，如果没有则默认为 "en"
+        router.push(`${locale}/login`)
       } else {
         setLoading(false)
       }
diff --git a/components/utility/change-password.tsx b/components/utility/change-password.tsx
index 00f498d..3cadaa3 100644
--- a/components/utility/change-password.tsx
+++ b/components/utility/change-password.tsx
@@ -29,7 +29,12 @@ export const ChangePassword: FC<ChangePasswordProps> = () => {
 
     toast.success("Password changed successfully.")
 
-    return router.push("/login")
+    // 提取当前路径中的 locale 部分
+    const pathname = router.pathname
+    const locale = pathname.split("/")[1] || "en"  // 获取路径中的 locale 部分，如果没有则默认为 "en"
+    
+    // 将 locale 添加到跳转 URL 中
+    return router.push(`/${locale}/login`)
   }
 
   return (
diff --git a/middleware.ts b/middleware.ts
index 422ff21..9560db3 100644
--- a/middleware.ts
+++ b/middleware.ts
@@ -26,6 +26,7 @@ export async function middleware(request: NextRequest) {
         throw new Error(error?.message)
       }
 
+      console.log("[middleware] redirecting to ",`/${homeWorkspace.id}/chat`)
       return NextResponse.redirect(
         new URL(`/${homeWorkspace.id}/chat`, request.url)
       )