diff --git a/src/app/(auth)/accept-invite/page.tsx b/src/app/(auth)/accept-invite/page.tsx
index 4deb163..132955f 100644
--- a/src/app/(auth)/accept-invite/page.tsx
+++ b/src/app/(auth)/accept-invite/page.tsx
@@ -18,6 +18,52 @@ import { AnimatedCard } from '@/components/shared/animated-container'
 
 type InviteState = 'loading' | 'valid' | 'accepting' | 'error'
 
+function ErrorRedirectCard({
+  errorContent,
+  redirectTarget,
+}: {
+  errorContent: { icon: React.ReactNode; title: string; description: string; redirect?: string }
+  redirectTarget: string
+}) {
+  const router = useRouter()
+
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      router.push(redirectTarget)
+    }, 4000)
+    return () => clearTimeout(timer)
+  }, [redirectTarget, router])
+
+  return (
+    <AnimatedCard>
+      <Card className="w-full max-w-md overflow-hidden">
+        <div className="h-1 w-full bg-gradient-to-r from-brand-blue via-brand-teal to-brand-blue" />
+        <CardHeader className="text-center">
+          <div className="mx-auto mb-4 flex h-12 w-12 items-center justify-center rounded-2xl bg-gray-100">
+            {errorContent.icon}
+          </div>
+          <CardTitle className="text-xl">{errorContent.title}</CardTitle>
+          <CardDescription className="text-base">
+            {errorContent.description}
+          </CardDescription>
+        </CardHeader>
+        <CardContent className="space-y-3">
+          <Button
+            variant="outline"
+            className="w-full"
+            onClick={() => router.push(redirectTarget)}
+          >
+            Go to Login
+          </Button>
+          <p className="text-xs text-center text-muted-foreground">
+            Redirecting to login in a few seconds...
+          </p>
+        </CardContent>
+      </Card>
+    </AnimatedCard>
+  )
+}
+
 function AcceptInviteContent() {
   const [state, setState] = useState<InviteState>('loading')
   const [errorType, setErrorType] = useState<string | null>(null)
@@ -105,18 +151,21 @@ function AcceptInviteContent() {
           icon: <XCircle className="h-6 w-6 text-red-600" />,
           title: 'Invalid Invitation',
           description: 'This invitation link is not valid. It may have already been used or the link is incorrect.',
+          redirect: '/login?expired=1',
         }
       case 'EXPIRED_TOKEN':
         return {
           icon: <Clock className="h-6 w-6 text-amber-600" />,
           title: 'Invitation Expired',
           description: 'This invitation has expired. Please contact your administrator to receive a new invitation.',
+          redirect: '/login?expired=1',
         }
       case 'ALREADY_ACCEPTED':
         return {
           icon: <CheckCircle2 className="h-6 w-6 text-blue-600" />,
           title: 'Already Accepted',
           description: 'This invitation has already been accepted. You can sign in with your credentials.',
+          redirect: '/login',
         }
       case 'AUTH_FAILED':
         return {
@@ -148,34 +197,12 @@ function AcceptInviteContent() {
     )
   }
 
-  // Error state
+  // Error state — auto-redirect to login after 4 seconds for known errors
   if (state === 'error') {
     const errorContent = getErrorContent()
-    return (
-      <AnimatedCard>
-      <Card className="w-full max-w-md overflow-hidden">
-        <div className="h-1 w-full bg-gradient-to-r from-brand-blue via-brand-teal to-brand-blue" />
-        <CardHeader className="text-center">
-          <div className="mx-auto mb-4 flex h-12 w-12 items-center justify-center rounded-2xl bg-gray-100">
-            {errorContent.icon}
-          </div>
-          <CardTitle className="text-xl">{errorContent.title}</CardTitle>
-          <CardDescription className="text-base">
-            {errorContent.description}
-          </CardDescription>
-        </CardHeader>
-        <CardContent>
-          <Button
-            variant="outline"
-            className="w-full"
-            onClick={() => router.push('/login')}
-          >
-            Go to Login
-          </Button>
-        </CardContent>
-      </Card>
-      </AnimatedCard>
-    )
+    const redirectTarget = errorContent.redirect || '/login'
+
+    return <ErrorRedirectCard errorContent={errorContent} redirectTarget={redirectTarget} />
   }
 
   // Valid invitation - show welcome
diff --git a/src/app/(auth)/error/page.tsx b/src/app/(auth)/error/page.tsx
index d7b950f..9f4d2f7 100644
--- a/src/app/(auth)/error/page.tsx
+++ b/src/app/(auth)/error/page.tsx
@@ -1,50 +1,96 @@
 'use client'
 
-import { useSearchParams } from 'next/navigation'
+import { useSearchParams, useRouter } from 'next/navigation'
+import { useEffect, Suspense } from 'react'
 import Link from 'next/link'
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
 import { Button } from '@/components/ui/button'
 import { Logo } from '@/components/shared/logo'
-import { AlertCircle } from 'lucide-react'
+import { AlertCircle, Clock, Loader2 } from 'lucide-react'
 import { AnimatedCard } from '@/components/shared/animated-container'
 
 const errorMessages: Record<string, string> = {
   Configuration: 'There is a problem with the server configuration.',
   AccessDenied: 'You do not have access to this resource.',
-  Verification: 'The verification link has expired or already been used.',
+  Verification: 'This sign-in link has expired or has already been used. Please request a new one.',
   Default: 'An error occurred during authentication.',
 }
 
-export default function AuthErrorPage() {
+function AuthErrorContent() {
   const searchParams = useSearchParams()
+  const router = useRouter()
   const error = searchParams.get('error') || 'Default'
   const message = errorMessages[error] || errorMessages.Default
+  const isExpired = error === 'Verification'
+
+  useEffect(() => {
+    if (isExpired) {
+      const timer = setTimeout(() => {
+        router.push('/login?expired=1')
+      }, 5000)
+      return () => clearTimeout(timer)
+    }
+  }, [isExpired, router])
 
   return (
     <AnimatedCard>
-    <Card className="w-full max-w-md overflow-hidden">
-      <div className="h-1 w-full bg-gradient-to-r from-brand-blue via-brand-teal to-brand-blue" />
-      <CardHeader className="text-center">
-        <div className="mx-auto mb-4">
-          <Logo variant="small" />
-        </div>
-        <div className="mx-auto mb-2 flex h-12 w-12 items-center justify-center rounded-2xl bg-destructive/10">
-          <AlertCircle className="h-6 w-6 text-destructive" />
-        </div>
-        <CardTitle className="text-xl">Authentication Error</CardTitle>
-      </CardHeader>
-      <CardContent className="space-y-4 text-center">
-        <p className="text-muted-foreground">{message}</p>
-        <div className="flex gap-3 justify-center border-t pt-4">
-          <Button asChild>
-            <Link href="/login">Return to Login</Link>
-          </Button>
-          <Button variant="outline" asChild>
-            <Link href="/">Home</Link>
-          </Button>
-        </div>
-      </CardContent>
-    </Card>
+      <Card className="w-full max-w-md overflow-hidden">
+        <div className="h-1 w-full bg-gradient-to-r from-brand-blue via-brand-teal to-brand-blue" />
+        <CardHeader className="text-center">
+          <div className="mx-auto mb-4">
+            <Logo variant="small" />
+          </div>
+          <div className="mx-auto mb-2 flex h-12 w-12 items-center justify-center rounded-2xl bg-destructive/10">
+            {isExpired ? (
+              <Clock className="h-6 w-6 text-amber-600" />
+            ) : (
+              <AlertCircle className="h-6 w-6 text-destructive" />
+            )}
+          </div>
+          <CardTitle className="text-xl">
+            {isExpired ? 'Link Expired' : 'Authentication Error'}
+          </CardTitle>
+        </CardHeader>
+        <CardContent className="space-y-4 text-center">
+          <p className="text-muted-foreground">{message}</p>
+          {isExpired && (
+            <p className="text-xs text-muted-foreground">
+              Redirecting to login in 5 seconds...
+            </p>
+          )}
+          <div className="flex gap-3 justify-center border-t pt-4">
+            <Button asChild>
+              <Link href="/login">
+                {isExpired ? 'Sign In Again' : 'Return to Login'}
+              </Link>
+            </Button>
+            {!isExpired && (
+              <Button variant="outline" asChild>
+                <Link href="/">Home</Link>
+              </Button>
+            )}
+          </div>
+        </CardContent>
+      </Card>
     </AnimatedCard>
   )
 }
+
+export default function AuthErrorPage() {
+  return (
+    <Suspense
+      fallback={
+        <AnimatedCard>
+          <Card className="w-full max-w-md overflow-hidden">
+            <div className="h-1 w-full bg-gradient-to-r from-brand-blue via-brand-teal to-brand-blue" />
+            <CardContent className="flex flex-col items-center justify-center py-12">
+              <Loader2 className="h-8 w-8 animate-spin text-muted-foreground" />
+            </CardContent>
+          </Card>
+        </AnimatedCard>
+      }
+    >
+      <AuthErrorContent />
+    </Suspense>
+  )
+}
diff --git a/src/app/(auth)/login/page.tsx b/src/app/(auth)/login/page.tsx
index 34f1626..5a907aa 100644
--- a/src/app/(auth)/login/page.tsx
+++ b/src/app/(auth)/login/page.tsx
@@ -15,7 +15,7 @@ import {
   CardHeader,
   CardTitle,
 } from '@/components/ui/card'
-import { Mail, Loader2, CheckCircle2, AlertCircle, Lock, KeyRound } from 'lucide-react'
+import { Mail, Loader2, CheckCircle2, AlertCircle, Lock, KeyRound, Clock } from 'lucide-react'
 import { AnimatedCard } from '@/components/shared/animated-container'
 
 type LoginMode = 'password' | 'magic-link'
@@ -32,6 +32,7 @@ export default function LoginPage() {
   const router = useRouter()
   const callbackUrl = searchParams.get('callbackUrl') || '/'
   const errorParam = searchParams.get('error')
+  const isExpiredLink = searchParams.get('expired') === '1'
 
   const handlePasswordLogin = async (e: React.FormEvent) => {
     e.preventDefault()
@@ -172,6 +173,17 @@ export default function LoginPage() {
         </CardDescription>
       </CardHeader>
       <CardContent>
+        {isExpiredLink && (
+          <div className="mb-4 flex items-start gap-3 rounded-lg border border-amber-200 bg-amber-50 p-3 text-sm">
+            <Clock className="h-4 w-4 mt-0.5 text-amber-600 shrink-0" />
+            <div>
+              <p className="font-medium text-amber-900">Your link has expired</p>
+              <p className="text-amber-700 mt-0.5">
+                Sign-in links expire after 15 minutes for security. Please sign in below or request a new magic link.
+              </p>
+            </div>
+          </div>
+        )}
         {mode === 'password' ? (
           // Password login form
           <form onSubmit={handlePasswordLogin} className="space-y-4">