diff --git a/app/components/auth/Authenticator.tsx b/app/components/auth/Authenticator.tsx
index 2b3216e..7436bec 100644
--- a/app/components/auth/Authenticator.tsx
+++ b/app/components/auth/Authenticator.tsx
@@ -21,6 +21,7 @@ import {
   useErrorNotification,
 } from '@/hooks/useGlobalNotification'
 import { useTranslation } from 'react-i18next'
+import GloTooltip from '@/components/common/GlobalTooltip'
 /**
  * Props interface for the Authenticator component.
  */
@@ -32,14 +33,13 @@ interface AuthenticatorProps {
 }
 
 /*
-  Authenticator Component
-
-  A React component that provides user authentication with email and password input, including
-  registration, verification code flow, and login.
-
-  @param onAuthSuccess Type: () => void. Callback invoked on successful authentication.
-
-  @returns JSX.Element The authenticator UI.
+  Authenticator component.
+ 
+  Provides user authentication UI and flow including login, registration, and email verification code.
+ 
+  @param onAuthSuccess Function. Callback invoked after a successful authentication flow. No default.
+ 
+  @returns JSX.Element The rendered authenticator UI.
 */
 export default function Authenticator({ onAuthSuccess }: AuthenticatorProps) {
   const [email, setEmail] = useState('')
@@ -56,7 +56,18 @@ export default function Authenticator({ onAuthSuccess }: AuthenticatorProps) {
   const { showErrorNotification } = useErrorNotification()
   const [codeErrorMessage, setCodeErrorMessage] = useState('')
   const { t, i18n } = useTranslation()
-
+  const [needCoolDown, setNeedCoolDown] = useState(false)
+  /*
+    Get current geolocation with a timeout guard.
+ 
+    Resolves with latitude and longitude if available, otherwise rejects on timeout or geolocation error.
+ 
+    @param options PositionOptions. Options passed to navigator.geolocation.getCurrentPosition. Default timeout is 5000 ms if not provided.
+ 
+    @returns Promise<{ latitude: number; longitude: number }> The resolved location coordinates.
+ 
+    @throws {Error} When the location request times out or geolocation reports an error.
+  */
   const getCurrentPositionAsync = (options: PositionOptions) => {
     return new Promise((resolve, reject) => {
       let resolved = false
@@ -88,12 +99,12 @@ export default function Authenticator({ onAuthSuccess }: AuthenticatorProps) {
     })
   }
   /*
-    Verify user credentials and handle registration or login.
-
-    @param email Type: string. The user's email address.
-    @param password Type: string. The user's password.
-
-    @returns Promise<void> Resolves when the flow completes.
+    Verify user credentials and handle registration or login based on the active tab.
+ 
+    @param email string. The user's email address.
+    @param password string. The user's password.
+ 
+    @returns Promise<void> Resolves when the verification/login flow is completed.
   */
   const loginVerify = async (email: string, password: string) => {
     setIsLoading(true)
@@ -109,6 +120,7 @@ export default function Authenticator({ onAuthSuccess }: AuthenticatorProps) {
         setIsLoading(false)
         if (response.auth_code === 200) {
           setNeedCode(response.confirmation_required)
+          setNeedCoolDown(response.confirmation_required)
           if (!response.confirmation_required) {
             showSuccessNotification('Registration Successful!')
             setActiveTab('login')
@@ -202,11 +214,11 @@ export default function Authenticator({ onAuthSuccess }: AuthenticatorProps) {
   }
 
   /*
-    Handle form submission for user authentication.
-
-    @param e Type: React.FormEvent. The form submit event.
-
-    @returns Promise<void> Resolves after submit handling is complete.
+    Handle form submission for user authentication (login or register).
+ 
+    @param e React.FormEvent. The form submit event.
+ 
+    @returns Promise<void> Resolves after submit handling completes.
   */
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault()
@@ -231,10 +243,10 @@ export default function Authenticator({ onAuthSuccess }: AuthenticatorProps) {
 
   /*
     Switch between login and register tabs.
-
-    @param event Type: React.SyntheticEvent. The tab change event.
-    @param value Type: 'login' | 'register'. The target tab value.
-
+ 
+    @param event React.SyntheticEvent. The tab change event.
+    @param value 'login' | 'register'. The target tab value to activate.
+ 
     @returns void
   */
   const handleTabChange = (
@@ -244,11 +256,11 @@ export default function Authenticator({ onAuthSuccess }: AuthenticatorProps) {
     setActiveTab(value)
   }
   /*
-    Submit the verification code in register flow.
-
-    @param inputCode Type: string. The 6-digit verification code.
-
-    @returns Promise<void> Resolves when the action completes.
+    Submit the verification code during the registration flow.
+ 
+    @param inputCode string. The 6-digit verification code provided by the user.
+ 
+    @returns Promise<void> Resolves when the verification handling completes.
   */
   const handleCodeSubmit = async (inputCode: string) => {
     setCodeErrorMessage('')
@@ -288,6 +300,20 @@ export default function Authenticator({ onAuthSuccess }: AuthenticatorProps) {
     }
   }
 
+  /*
+    Request sending or resending a verification code to the provided email.
+ 
+    No action is taken if the email field is empty.
+ 
+    @returns Promise<void> Resolves after the resend request completes.
+  */
+  const handleNeedCode = async () => {
+    if (!email) {
+      return
+    }
+    setNeedCode(true)
+  }
+
   const buttonText = (() => {
     if (activeTab === 'login') {
       return isLoading ? t('auth.signingIn') : t('auth.signIn')
@@ -504,7 +530,24 @@ export default function Authenticator({ onAuthSuccess }: AuthenticatorProps) {
           </button>
         </div>
         {/** code */}
-
+        <div
+          style={{
+            display: 'flex',
+            alignItems: 'center',
+            justifyContent: 'end',
+            color: '#fff',
+            fontSize: '14px',
+            fontWeight: '500',
+            marginBottom: '16px',
+            textAlign: 'left',
+            cursor: 'pointer',
+          }}
+          onClick={handleNeedCode}
+        >
+          <GloTooltip content={t('auth.enterTheVerificationCodeDescription')}>
+            <div>{t('auth.needToEnterTheVerificationCode')}</div>
+          </GloTooltip>
+        </div>
         {/* Sign In Button */}
         <button
           type="submit"
@@ -543,6 +586,7 @@ export default function Authenticator({ onAuthSuccess }: AuthenticatorProps) {
         onSubmit={handleCodeSubmit}
         isSubmitting={isLoading}
         errorMessage={codeErrorMessage}
+        needCoolDown={needCoolDown}
       />
     </div>
   )
diff --git a/app/components/auth/EmailCodeModal.tsx b/app/components/auth/EmailCodeModal.tsx
index 0b27382..efd55af 100644
--- a/app/components/auth/EmailCodeModal.tsx
+++ b/app/components/auth/EmailCodeModal.tsx
@@ -3,16 +3,45 @@
 import React, { useEffect, useState } from 'react'
 import { Dialog } from '@/components/common/Dialog'
 import { useTranslation } from 'react-i18next'
-
+import GloTooltip from '@/components/common/GlobalTooltip'
+import { fetchResendConfirmationCode } from '@/request/api'
+import {
+  useSuccessNotification,
+  useErrorNotification,
+} from '@/hooks/useGlobalNotification'
+/*
+  Props for the EmailCodeModal component.
+ 
+  Displays and manages the email verification code modal including code input,
+  resend logic with cooldown, and submission handling.
+*/
 interface EmailCodeModalProps {
   isOpen: boolean
-  email?: string
+  email: string
   onClose: () => void
   onSubmit?: (code: string) => void | Promise<void>
   onResend?: () => void | Promise<void>
   isSubmitting?: boolean
   errorMessage?: string
+  needCoolDown?: boolean
 }
+/*
+  EmailCodeModal component.
+ 
+  Renders a dialog to enter a 6-digit email verification code and supports resending
+  the code with a cooldown period.
+ 
+  @param isOpen boolean. Whether the dialog is open.
+  @param email string. The email address to which the code was sent.
+  @param onClose Function. Called when the dialog should close.
+  @param onSubmit Function | Promise<void>. Optional submit handler for the entered code. No default.
+  @param onResend Function | Promise<void>. Optional external resend handler (unused here). No default.
+  @param isSubmitting boolean. Whether submission is in progress. Default: false.
+  @param errorMessage string | undefined. Optional error message to display. No default.
+  @param needCoolDown boolean. If true, initializes resend cooldown. Default: false.
+ 
+  @returns JSX.Element The verification code dialog UI.
+*/
 export default function EmailCodeModal({
   isOpen,
   email,
@@ -20,28 +49,59 @@ export default function EmailCodeModal({
   onSubmit,
   isSubmitting = false,
   errorMessage,
+  needCoolDown = false,
 }: EmailCodeModalProps) {
-  /*
-    Handle verification code form submission.
-
-    @param e React.FormEvent - The form submit event.
-
-    @returns Promise<void> Resolves when the submit completes.
-  */
+  const { showSuccessNotification } = useSuccessNotification()
+  const { showErrorNotification } = useErrorNotification()
   const [code, setCode] = useState('')
-  const { t } = useTranslation()
+  const { t, i18n } = useTranslation()
   useEffect(() => {
     if (isOpen) {
       setCode('')
+      if (needCoolDown) {
+        setResendCooldown(60)
+      }
     }
   }, [isOpen])
 
+  /*
+    Handle verification code form submission.
+ 
+    @param e React.FormEvent. The form submit event.
+ 
+    @returns Promise<void> Resolves when the submit completes.
+  */
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault()
     if (!code.trim()) return
     await onSubmit?.(code.trim())
   }
 
+  const [resendCooldown, setResendCooldown] = useState(0)
+  useEffect(() => {
+    if (resendCooldown <= 0) return
+    const timer = setTimeout(() => setResendCooldown(prev => prev - 1), 1000)
+    return () => clearTimeout(timer)
+  }, [resendCooldown])
+
+  /*
+    Resend a verification code and start/reset the cooldown timer.
+ 
+    No action is taken if the cooldown is still active.
+ 
+    @returns Promise<void> Resolves after the resend attempt completes.
+  */
+  const handleResend = async () => {
+    if (resendCooldown > 0) return
+    const response = await fetchResendConfirmationCode(email, i18n.language)
+    if (response.auth_code === 200) {
+      showSuccessNotification(t('notification.verificationCodeResentSuccessfully'))
+      setResendCooldown(60)
+    } else {
+      showErrorNotification(response.auth_msg)
+    }
+  }
+
   return (
     <Dialog
       isOpen={isOpen}
@@ -49,6 +109,8 @@ export default function EmailCodeModal({
       title={t('auth.emailVerificationCode')}
       maxWidth="420px"
       className="email-code-dialog"
+      closeOnEscape={false}
+      closeOnBackdropClick={false}
     >
       <form
         onSubmit={handleSubmit}
@@ -61,7 +123,23 @@ export default function EmailCodeModal({
           </span>{' '}
           {t('auth.pleaseEnterThe6DigitCodeInTheEmailToCompleteTheVerification')}
         </div>
-
+        <div
+          style={{
+            display: 'flex',
+            alignItems: 'center',
+            justifyContent: 'end',
+            color: '#fff',
+            fontSize: '14px',
+            fontWeight: '500',
+            marginBottom: '16px',
+            textAlign: 'left',
+            cursor: 'pointer',
+          }}
+        >
+          <GloTooltip content={t('auth.resendVerificationCodeDescription')}>
+            <div>{t('auth.didNotReceiveTheVerificationCode')}</div>
+          </GloTooltip>
+        </div>
         <label style={{ color: '#8b8ea8', fontSize: '14px' }}>
           {t('auth.verificationCode')}
         </label>
@@ -74,7 +152,6 @@ export default function EmailCodeModal({
           onChange={e => setCode(e.target.value)}
           placeholder={t('auth.enterTheVerificationCode')}
           style={{
-            width: '100%',
             height: '48px',
             padding: '0 14px',
             backgroundColor: 'transparent',
@@ -91,11 +168,9 @@ export default function EmailCodeModal({
             e.currentTarget.style.borderColor = '#333652'
           }}
         />
-
         {errorMessage ? (
           <div style={{ color: '#ff6b6b', fontSize: '13px' }}>{errorMessage}</div>
         ) : null}
-
         <div
           style={{
             display: 'flex',
@@ -105,6 +180,35 @@ export default function EmailCodeModal({
           }}
         >
           <button
+            type="button"
+            onClick={handleResend}
+            style={{
+              padding: '10px 16px',
+              borderRadius: '8px',
+              background: 'transparent',
+              color: '#aaa',
+              border: '1px solid #333652',
+              cursor: resendCooldown > 0 ? 'not-allowed' : 'pointer',
+              opacity: resendCooldown > 0 ? 0.6 : 1,
+            }}
+            onMouseEnter={e => {
+              if (resendCooldown === 0) {
+                e.currentTarget.style.backgroundColor = '#333652'
+                e.currentTarget.style.color = '#ffffff'
+              }
+            }}
+            onMouseLeave={e => {
+              e.currentTarget.style.backgroundColor = 'transparent'
+              e.currentTarget.style.color = '#aaa'
+            }}
+            disabled={resendCooldown > 0}
+          >
+            {resendCooldown > 0
+              ? `${t('auth.resendVerificationCode')} (${resendCooldown}s)`
+              : t('auth.resendVerificationCode')}
+          </button>
+
+          {/* <button
             type="button"
             onClick={onClose}
             style={{
@@ -125,7 +229,7 @@ export default function EmailCodeModal({
             }}
           >
             {t('common.cancel')}
-          </button>
+          </button> */}
 
           <button
             type="submit"
diff --git a/app/components/common/GlobalTooltip.tsx b/app/components/common/GlobalTooltip.tsx
index 7e1545b..f4801d7 100644
--- a/app/components/common/GlobalTooltip.tsx
+++ b/app/components/common/GlobalTooltip.tsx
@@ -5,6 +5,12 @@ import Tooltip, { TooltipProps } from '@mui/material/Tooltip'
 import InfoOutlined from '@mui/icons-material/InfoOutlined'
 import { useDevice } from '@/contexts/DeviceContext'
 
+/*
+  Props for the GlobalTooltip component.
+ 
+  Extends MUI TooltipProps while overriding 'title' and 'children' in favor of
+  a flexible `content` field and an optional custom trigger element.
+*/
 type GlobalTooltipProps = Omit<TooltipProps, 'title' | 'children'> & {
   content: string | string[] | React.ReactNode
   children?: React.ReactNode
@@ -13,20 +19,22 @@ type GlobalTooltipProps = Omit<TooltipProps, 'title' | 'children'> & {
   popperZIndex?: number
 }
 
-/**
- * GlobalTooltip component.
- *
- * Renders a tooltip with content from i18n t() strings or custom nodes.
- * Newlines in string content are rendered as line breaks.
- * If no children are provided, an info icon is used as the trigger.
- *
- * @param content The tooltip content: a t() string (supports \n), or an array rendered line-by-line.
- * @param children Optional custom trigger element; defaults to an info icon.
- * @param iconStyle Optional inline styles applied to the default icon.
- * @param titleProps Optional props applied to the content wrapper element.
- *
- * @returns JSX.Element The tooltip-wrapped trigger element.
- */
+/*
+  GlobalTooltip component.
+ 
+  Renders a tooltip with content from i18n strings, arrays, or custom React nodes.
+  If no children are provided, an info icon is used as the trigger.
+ 
+  @param content string | string[] | React.ReactNode. Tooltip content; strings support newlines.
+  @param children React.ReactNode | undefined. Optional custom trigger element. Default: undefined (uses info icon).
+  @param iconStyle React.CSSProperties | undefined. Optional style for the default icon. No default.
+  @param titleProps React.HTMLAttributes<HTMLSpanElement> | undefined. Optional props for content wrapper. No default.
+  @param arrow boolean. Whether to show the tooltip arrow. Default: true.
+  @param placement TooltipProps['placement']. Tooltip placement relative to the trigger. Default: 'top'.
+  @param popperZIndex number. Z-index for the Popper container. Default: 100001.
+ 
+  @returns JSX.Element Tooltip-wrapped trigger element.
+*/
 export default function GlobalTooltip({
   content,
   children,
@@ -34,14 +42,14 @@ export default function GlobalTooltip({
   titleProps,
   arrow = true,
   placement = 'top',
-  popperZIndex = 20000,
+  popperZIndex = 100001,
   ...rest
 }: GlobalTooltipProps) {
   const { isMobile } = useDevice()
   const [open, setOpen] = React.useState(false)
   const titleNode = Array.isArray(content) ? (
     <span
-      style={{ whiteSpace: 'pre-wrap', display: 'inline-block', zIndex: 20000 }}
+      style={{ whiteSpace: 'pre-wrap', display: 'inline-block', zIndex: 100001 }}
       {...titleProps}
     >
       {content.map((line, idx) => (
@@ -52,7 +60,7 @@ export default function GlobalTooltip({
       ))}
     </span>
   ) : typeof content === 'string' ? (
-    <span style={{ whiteSpace: 'pre-line', zIndex: 20000 }} {...titleProps}>
+    <span style={{ whiteSpace: 'pre-line', zIndex: 100001 }} {...titleProps}>
       {content}
     </span>
   ) : (
@@ -73,7 +81,7 @@ export default function GlobalTooltip({
         maxWidth: 360,
         overflowWrap: 'break-word',
         wordBreak: 'break-word',
-        zIndex: '20000 !important',
+        zIndex: '100001 !important',
         ...(rest.componentsProps?.tooltip as any)?.sx,
       },
     },
@@ -159,7 +167,7 @@ export default function GlobalTooltip({
           },
         ],
       }}
-      sx={{ zIndex: 20000 }}
+      sx={{ zIndex: 100001 }}
     >
       {/* span ensures a valid single child for Tooltip when using plain text */}
       <span
diff --git a/app/i18n/locales/en/fronted.json b/app/i18n/locales/en/fronted.json
index c50ef57..87657e5 100644
--- a/app/i18n/locales/en/fronted.json
+++ b/app/i18n/locales/en/fronted.json
@@ -54,13 +54,18 @@
     "emailVerificationCode": "Email Verification Code",
     "weHaveSentAVerificationCodeTo": "We have sent a verification code to",
     "pleaseEnterThe6DigitCodeInTheEmailToCompleteTheVerification": "Please enter the 6-digit code in the email to complete the verification.",
+    "needToEnterTheVerificationCode": "Haven't confirmed your email?",
+    "enterTheVerificationCodeDescription": "Click here if you've registered but haven't confirmed your email address yet. You'll need the confirmation code sent to your email.",
+    "resendVerificationCodeDescription": "Please verify that your email address is correct. If you don’t receive the code, try requesting a new one and check your spam or junk folder in case it was filtered.",
+    "didNotReceiveTheVerificationCode": "Nothing received?",
     "verificationCode": "Verification Code",
     "verificationCodeVerifiedSuccessfully": "Verification code verified successfully",
     "enterTheVerificationCode": "Enter the verification code",
     "toDeleteYourAccountPleaseConfirmYourEmailAndPassword": "To delete your account, please confirm your email and password.",
     "thisActionIsIrreversible": "This action is irreversible!",
     "enterYourPassword": "Enter your password",
-    "deleteAccount": "Delete Account"
+    "deleteAccount": "Delete Account",
+    "resendVerificationCode": "Resend Verification Code"
   },
   "chat": {
     "chat": "Chat",
diff --git a/app/i18n/locales/zh/fronted.json b/app/i18n/locales/zh/fronted.json
index 07a6db4..e11aefc 100644
--- a/app/i18n/locales/zh/fronted.json
+++ b/app/i18n/locales/zh/fronted.json
@@ -54,8 +54,13 @@
     "emailVerificationCode": "邮箱验证码",
     "weHaveSentAVerificationCodeTo": "我们已向你的邮箱发送了验证码，请输入验证码以完成验证",
     "pleaseEnterThe6DigitCodeInTheEmailToCompleteTheVerification": "请输入6位验证码以完成验证",
+    "didNotReceiveTheVerificationCode": "没有收到验证码？",
+    "resendVerificationCodeDescription": "确认您的邮箱地址是否正确，如长时间未收到请重新请求验证码。验证码有时会被拦截，请检查垃圾邮件。",
+    "needToEnterTheVerificationCode": "需要输入验证码？",
+    "enterTheVerificationCodeDescription": "如果您已尝试注册但尚未确认注册邮箱，请点击此处。您需要使用发送到邮箱的确认码。",
     "verificationCode": "验证码",
     "enterTheVerificationCode": "输入验证码",
+    "resendVerificationCode": "重新发送验证码",
     "invalidOrExpiredVerificationCode": "无效或过期的验证码，请稍后再试",
     "toDeleteYourAccountPleaseConfirmYourEmailAndPassword": "要删除你的账户，请确认你的邮箱和密码",
     "thisActionIsIrreversible": "此操作不可逆",
diff --git a/app/request/api.ts b/app/request/api.ts
index 969c681..7f5d0e7 100644
--- a/app/request/api.ts
+++ b/app/request/api.ts
@@ -488,9 +488,9 @@ export async function fetchDeleteUser(
   @returns Promise<{ auth_code: number; auth_msg: string }>
   Result of the resend operation.
 */
-export async function fetchResendConfirmationCode(email: string) {
+export async function fetchResendConfirmationCode(email: string, language?: string) {
   const response = await kyDlpApi.post(`resend_confirmation_code`, {
-    json: { email: email },
+    json: { email: email, language: language || 'en' },
   })
   return response.json<{ auth_code: number; auth_msg: string }>()
 }