diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx
index 8578791..2a1d25a 100644
--- a/src/app/login/page.tsx
+++ b/src/app/login/page.tsx
@@ -1,79 +1,15 @@
-'use client';
+import { Suspense } from 'react';
+import LoginForm from '@/components/login/LoginForm';
+export const dynamic = 'force-dynamic';
 
-import { loginAction, LoginResult, clearExpiredSessionAction } from '@/lib/actions/auth';
-import { useActionState, useEffect } from 'react';
-import { useSearchParams } from 'next/navigation';
-
-const initialState: LoginResult = {
-	message: '',
-	success: true
-};
-
-export default function LoginPage() {
-	const searchParams = useSearchParams();
-	const expired = searchParams.get('expired') === 'true';
-	const [state, formAction] = useActionState(loginAction, initialState);
-
-	useEffect(() => {
-		if (expired) {
-			clearExpiredSessionAction();
-		}
-	}, [expired]);
+export default function LoginPage({
+	searchParams
+}: {
+	searchParams: Promise<{ expired: boolean | undefined }>;
+}) {
 	return (
-		<div className="flex min-h-screen items-center justify-center bg-gray-900 px-4">
-			<div className="w-full max-w-md space-y-8 rounded-lg bg-gray-800 p-8 shadow-lg">
-				<div className="text-center">
-					<h1 className="text-3xl font-bold text-white">ACC Server Manager</h1>
-					<p className="mt-2 text-gray-400">Sign in to manage your servers</p>
-				</div>
-				{expired && (
-					<div className="rounded-md border border-yellow-700 bg-yellow-900/50 p-3 text-sm text-yellow-200">
-						Your session has expired. Please sign in again.
-					</div>
-				)}
-				{state?.success ? null : (
-					<div className="rounded-md border border-red-700 bg-red-900/50 p-3 text-sm text-red-200">
-						{state?.message}
-					</div>
-				)}
-
-				<form action={formAction} className="space-y-6">
-					<div>
-						<label htmlFor="username" className="mb-2 block text-sm font-medium text-gray-300">
-							Username
-						</label>
-						<input
-							id="username"
-							name="username"
-							type="text"
-							autoComplete="username"
-							required
-							className="form-input w-full"
-						/>
-					</div>
-
-					<div>
-						<label htmlFor="password" className="mb-2 block text-sm font-medium text-gray-300">
-							Password
-						</label>
-						<input
-							id="password"
-							name="password"
-							type="password"
-							autoComplete="current-password"
-							required
-							className="form-input w-full"
-						/>
-					</div>
-
-					<button
-						type="submit"
-						className="w-full rounded-md bg-blue-600 px-4 py-3 font-medium text-white transition-colors hover:bg-blue-700 focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 focus:ring-offset-gray-800 focus:outline-none"
-					>
-						Sign in
-					</button>
-				</form>
-			</div>
-		</div>
+		<Suspense fallback={<div>Loading...</div>}>
+			<LoginForm searchParams={searchParams} />
+		</Suspense>
 	);
 }
diff --git a/src/components/login/LoginForm.tsx b/src/components/login/LoginForm.tsx
new file mode 100644
index 0000000..cb0e6fe
--- /dev/null
+++ b/src/components/login/LoginForm.tsx
@@ -0,0 +1,82 @@
+'use client';
+
+import { clearExpiredSessionAction, loginAction, LoginResult } from '@/lib/actions/auth';
+import { use, useActionState, useEffect } from 'react';
+
+const initialState: LoginResult = {
+	message: '',
+	success: true
+};
+
+export default function LoginForm({
+	searchParams
+}: {
+	searchParams: Promise<{ expired: boolean | undefined }>;
+}) {
+	const params = use(searchParams);
+	const expired = params.expired;
+
+	useEffect(() => {
+		if (expired) {
+			clearExpiredSessionAction();
+		}
+	}, [expired]);
+	const [state, formAction] = useActionState(loginAction, initialState);
+	return (
+		<div className="flex min-h-screen items-center justify-center bg-gray-900 px-4">
+			<div className="w-full max-w-md space-y-8 rounded-lg bg-gray-800 p-8 shadow-lg">
+				<div className="text-center">
+					<h1 className="text-3xl font-bold text-white">ACC Server Manager</h1>
+					<p className="mt-2 text-gray-400">Sign in to manage your servers</p>
+				</div>
+				{expired && (
+					<div className="rounded-md border border-yellow-700 bg-yellow-900/50 p-3 text-sm text-yellow-200">
+						Your session has expired. Please sign in again.
+					</div>
+				)}
+				{state?.success ? null : (
+					<div className="rounded-md border border-red-700 bg-red-900/50 p-3 text-sm text-red-200">
+						{state?.message}
+					</div>
+				)}
+
+				<form action={formAction} className="space-y-6">
+					<div>
+						<label htmlFor="username" className="mb-2 block text-sm font-medium text-gray-300">
+							Username
+						</label>
+						<input
+							id="username"
+							name="username"
+							type="text"
+							autoComplete="username"
+							required
+							className="form-input w-full"
+						/>
+					</div>
+
+					<div>
+						<label htmlFor="password" className="mb-2 block text-sm font-medium text-gray-300">
+							Password
+						</label>
+						<input
+							id="password"
+							name="password"
+							type="password"
+							autoComplete="current-password"
+							required
+							className="form-input w-full"
+						/>
+					</div>
+
+					<button
+						type="submit"
+						className="w-full rounded-md bg-blue-600 px-4 py-3 font-medium text-white transition-colors hover:bg-blue-700 focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 focus:ring-offset-gray-800 focus:outline-none"
+					>
+						Sign in
+					</button>
+				</form>
+			</div>
+		</div>
+	);
+}
diff --git a/src/lib/api/client/base.ts b/src/lib/api/client/base.ts
index 2d75aaa..740121c 100644
--- a/src/lib/api/client/base.ts
+++ b/src/lib/api/client/base.ts
@@ -49,7 +49,7 @@ export async function fetchClientAPI<T>(
 
 	if (!response.ok) {
 		if (response.status === 401) {
-			window.location.href = '/login';
+			window.location.href = '/login?expired=true';
 			return { error: 'unauthorized' };
 		}
 		throw new Error(`API Error: ${response.statusText} - ${method} - ${BASE_URL}${endpoint}`);
diff --git a/src/lib/auth/server.ts b/src/lib/auth/server.ts
index 5caa26f..7374ac2 100644
--- a/src/lib/auth/server.ts
+++ b/src/lib/auth/server.ts
@@ -12,7 +12,7 @@ export async function requireAuth(skipRedirect?: boolean) {
 	const session = await getSession();
 
 	if (!skipRedirect && (!session.token || !session.user)) {
-		redirect('/login');
+		redirect('/login?expired=true');
 	}
 
 	return session;