diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx
index 0bcfce7..9ba4b78 100644
--- a/src/pages/Login.tsx
+++ b/src/pages/Login.tsx
@@ -32,6 +32,7 @@ export default function Login() {
   const [isLoading, setIsLoading] = useState(false)
   const [isTelegramWebApp, setIsTelegramWebApp] = useState(false)
   const [logoLoaded, setLogoLoaded] = useState(() => isLogoPreloaded())
+  const [registeredEmail, setRegisteredEmail] = useState<string | null>(null)
 
   // Получаем URL для возврата после авторизации
   const getReturnUrl = useCallback(() => {
@@ -134,10 +135,12 @@ export default function Login() {
     try {
       if (authMode === 'login') {
         await loginWithEmail(email, password)
+        navigate(getReturnUrl(), { replace: true })
       } else {
-        await registerWithEmail(email, password, firstName || undefined, referralCode || undefined)
+        const result = await registerWithEmail(email, password, firstName || undefined, referralCode || undefined)
+        // Show "check your email" screen
+        setRegisteredEmail(result.email)
       }
-      navigate(getReturnUrl(), { replace: true })
     } catch (err: unknown) {
       const error = err as { response?: { status?: number; data?: { detail?: string } } }
       const status = error.response?.status
@@ -146,11 +149,15 @@ export default function Login() {
       if (status === 400 && detail?.includes('already registered')) {
         setError(t('auth.emailAlreadyRegistered', 'This email is already registered'))
       } else if (status === 401 || status === 403) {
-        setError(t('auth.invalidCredentials', 'Invalid email or password'))
+        if (detail?.includes('verify your email')) {
+          setError(t('auth.emailNotVerified', 'Please verify your email first'))
+        } else {
+          setError(t('auth.invalidCredentials', 'Invalid email or password'))
+        }
       } else if (status === 429) {
         setError(t('auth.tooManyAttempts', 'Too many attempts. Please try again later'))
       } else {
-        setError(t('common.error'))
+        setError(detail || t('common.error'))
       }
     } finally {
       setIsLoading(false)
@@ -208,7 +215,36 @@ export default function Login() {
           )}
         </div>
 
-        {/* Card */}
+        {/* Check Email Screen */}
+        {registeredEmail ? (
+          <div className="card text-center">
+            <div className="w-16 h-16 mx-auto mb-6 rounded-2xl bg-success-500/20 flex items-center justify-center">
+              <svg className="w-8 h-8 text-success-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={1.5}>
+                <path strokeLinecap="round" strokeLinejoin="round" d="M21.75 6.75v10.5a2.25 2.25 0 01-2.25 2.25h-15a2.25 2.25 0 01-2.25-2.25V6.75m19.5 0A2.25 2.25 0 0019.5 4.5h-15a2.25 2.25 0 00-2.25 2.25m19.5 0v.243a2.25 2.25 0 01-1.07 1.916l-7.5 4.615a2.25 2.25 0 01-2.36 0L3.32 8.91a2.25 2.25 0 01-1.07-1.916V6.75" />
+              </svg>
+            </div>
+            <h2 className="text-xl font-bold text-dark-50 mb-2">
+              {t('auth.checkEmail', 'Check your email')}
+            </h2>
+            <p className="text-dark-400 mb-4">
+              {t('auth.verificationSent', 'We sent a verification link to:')}
+            </p>
+            <p className="text-accent-400 font-medium mb-6">{registeredEmail}</p>
+            <p className="text-sm text-dark-500 mb-6">
+              {t('auth.clickLinkToVerify', 'Click the link in the email to verify your account and log in.')}
+            </p>
+            <button
+              onClick={() => {
+                setRegisteredEmail(null)
+                setAuthMode('login')
+              }}
+              className="btn-secondary w-full"
+            >
+              {t('auth.backToLogin', 'Back to login')}
+            </button>
+          </div>
+        ) : (
+        /* Card */
         <div className="card">
           {/* Tabs */}
           <div className="flex mb-6">
@@ -389,6 +425,7 @@ export default function Login() {
             </div>
           )}
         </div>
+        )}
       </div>
     </div>
   )
diff --git a/src/pages/VerifyEmail.tsx b/src/pages/VerifyEmail.tsx
index ee670f6..b44eda0 100644
--- a/src/pages/VerifyEmail.tsx
+++ b/src/pages/VerifyEmail.tsx
@@ -1,14 +1,18 @@
 import { useEffect, useState } from 'react'
-import { useSearchParams, Link } from 'react-router-dom'
+import { useSearchParams, Link, useNavigate } from 'react-router-dom'
 import { useTranslation } from 'react-i18next'
 import { authApi } from '../api/auth'
+import { useAuthStore } from '../store/auth'
+import { tokenStorage } from '../utils/token'
 import LanguageSwitcher from '../components/LanguageSwitcher'
 
 export default function VerifyEmail() {
   const { t } = useTranslation()
+  const navigate = useNavigate()
   const [searchParams] = useSearchParams()
   const [status, setStatus] = useState<'loading' | 'success' | 'error'>('loading')
   const [error, setError] = useState('')
+  const { setTokens, setUser, checkAdminStatus } = useAuthStore()
 
   useEffect(() => {
     const token = searchParams.get('token')
@@ -21,8 +25,15 @@ export default function VerifyEmail() {
 
     const verify = async () => {
       try {
-        await authApi.verifyEmail(token)
+        const response = await authApi.verifyEmail(token)
+        // Save tokens and log user in
+        tokenStorage.setTokens(response.access_token, response.refresh_token)
+        setTokens(response.access_token, response.refresh_token)
+        setUser(response.user)
+        checkAdminStatus()
         setStatus('success')
+        // Redirect to dashboard after short delay
+        setTimeout(() => navigate('/', { replace: true }), 1500)
       } catch (err: unknown) {
         setStatus('error')
         const error = err as { response?: { data?: { detail?: string } } }
@@ -31,7 +42,7 @@ export default function VerifyEmail() {
     }
 
     verify()
-  }, [searchParams, t])
+  }, [searchParams, t, navigate, setTokens, setUser, checkAdminStatus])
 
   return (
     <div className="min-h-screen flex items-center justify-center bg-gray-50 py-8 px-4 sm:py-12">
@@ -54,12 +65,10 @@ export default function VerifyEmail() {
             <div className="text-green-500 text-5xl sm:text-6xl mb-4">✓</div>
             <h2 className="text-lg sm:text-xl font-semibold text-gray-900">{t('emailVerification.success')}</h2>
             <p className="text-sm sm:text-base text-gray-500 mt-2">
-              {t('emailVerification.successMessage')}
+              {t('emailVerification.redirecting', 'Redirecting to dashboard...')}
             </p>
-            <div className="mt-6">
-              <Link to="/login" className="btn-primary">
-                {t('emailVerification.goToLogin')}
-              </Link>
+            <div className="mt-4">
+              <div className="animate-spin rounded-full h-6 w-6 border-b-2 border-primary-600 mx-auto"></div>
             </div>
           </div>
         )}