diff --git a/atsf_server/web/app/(public)/reset/page.tsx b/atsf_server/web/app/(public)/reset/page.tsx
index b085bb8a..936dd236 100644
--- a/atsf_server/web/app/(public)/reset/page.tsx
+++ b/atsf_server/web/app/(public)/reset/page.tsx
@@ -1,12 +1,12 @@
 import { Suspense } from 'react';
 
 import { LoadingState } from '@/components/feedback/loading-state';
-import { PasswordResetRequestForm } from '@/features/auth/components/password-reset-request-form';
+import { PasswordResetFlow } from '@/features/auth/components/password-reset-flow';
 
 export default function ResetPasswordPage() {
   return (
     <Suspense fallback={<LoadingState />}>
-      <PasswordResetRequestForm />
+      <PasswordResetFlow />
     </Suspense>
   );
 }
diff --git a/atsf_server/web/app/(public)/user/reset/page.tsx b/atsf_server/web/app/(public)/user/reset/page.tsx
index 2c596179..e02019a0 100644
--- a/atsf_server/web/app/(public)/user/reset/page.tsx
+++ b/atsf_server/web/app/(public)/user/reset/page.tsx
@@ -1,12 +1,12 @@
 import { Suspense } from 'react';
 
 import { LoadingState } from '@/components/feedback/loading-state';
-import { PasswordResetConfirmForm } from '@/features/auth/components/password-reset-confirm-form';
+import { PasswordResetFlow } from '@/features/auth/components/password-reset-flow';
 
 export default function LegacyResetPasswordPage() {
   return (
     <Suspense fallback={<LoadingState />}>
-      <PasswordResetConfirmForm />
+      <PasswordResetFlow />
     </Suspense>
   );
 }
diff --git a/atsf_server/web/components/layout/public-shell.tsx b/atsf_server/web/components/layout/public-shell.tsx
index 33b6fea4..188438a4 100644
--- a/atsf_server/web/components/layout/public-shell.tsx
+++ b/atsf_server/web/components/layout/public-shell.tsx
@@ -15,9 +15,9 @@ export function PublicShell({ children }: PublicShellProps) {
         <div className='mb-8 flex flex-col gap-4 border-b border-[var(--border-default)] pb-6 md:flex-row md:items-end md:justify-between'>
           <div>
             <p className='text-sm font-medium uppercase tracking-[0.24em] text-[var(--brand-primary)]'>ATSFlare</p>
-            <h1 className='mt-2 text-3xl font-semibold text-[var(--foreground-primary)]'>管理端改造进行中</h1>
+            <h1 className='mt-2 text-3xl font-semibold text-[var(--foreground-primary)]'>欢迎使用 ATSFlare 管理端</h1>
             <p className='mt-2 text-sm leading-6 text-[var(--foreground-secondary)]'>
-              认证流程将在阶段 2 接入。当前页面用于承载入口骨架与路由占位。
+              当前已接入登录、注册、密码重置与 GitHub OAuth 基础流程，后续将继续完善鉴权与业务模块体验。
             </p>
           </div>
           <div className='flex flex-col items-start gap-3 text-sm text-[var(--foreground-secondary)] md:items-end'>
diff --git a/atsf_server/web/features/auth/components/password-reset-confirm-form.tsx b/atsf_server/web/features/auth/components/password-reset-confirm-form.tsx
index 1cea5411..855cc56b 100644
--- a/atsf_server/web/features/auth/components/password-reset-confirm-form.tsx
+++ b/atsf_server/web/features/auth/components/password-reset-confirm-form.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import { useMutation } from '@tanstack/react-query';
+import Link from 'next/link';
 import { useSearchParams } from 'next/navigation';
 import { useState } from 'react';
 
@@ -68,6 +69,13 @@ export function PasswordResetConfirmForm() {
             </SecondaryButton>
           ) : null}
         </div>
+
+        <div className='text-sm text-[var(--foreground-secondary)]'>
+          处理完成后可返回
+          <Link href='/login' className='ml-2 text-[var(--brand-primary)] transition hover:opacity-80'>
+            登录页
+          </Link>
+        </div>
       </div>
     </AppCard>
   );
diff --git a/atsf_server/web/features/auth/components/password-reset-flow.tsx b/atsf_server/web/features/auth/components/password-reset-flow.tsx
new file mode 100644
index 00000000..47e04fc7
--- /dev/null
+++ b/atsf_server/web/features/auth/components/password-reset-flow.tsx
@@ -0,0 +1,13 @@
+'use client';
+
+import { useSearchParams } from 'next/navigation';
+
+import { PasswordResetConfirmForm } from '@/features/auth/components/password-reset-confirm-form';
+import { PasswordResetRequestForm } from '@/features/auth/components/password-reset-request-form';
+
+export function PasswordResetFlow() {
+  const searchParams = useSearchParams();
+  const hasConfirmationParams = Boolean(searchParams?.get('email') && searchParams?.get('token'));
+
+  return hasConfirmationParams ? <PasswordResetConfirmForm /> : <PasswordResetRequestForm />;
+}
\ No newline at end of file