diff --git a/frontend/src/routes/login/+page.svelte b/frontend/src/routes/login/+page.svelte
index 95607e1c..49550710 100644
--- a/frontend/src/routes/login/+page.svelte
+++ b/frontend/src/routes/login/+page.svelte
@@ -5,7 +5,10 @@ import AuthHeader from '../AuthHeader.svelte';
 let {
 	data,
 	form
-}: { data: { registered: boolean }; form?: { error?: string; success?: boolean } } = $props();
+}: {
+	data: { registered: boolean; reason?: string | null };
+	form?: { error?: string; success?: boolean };
+} = $props();
 </script>
 
 <svelte:head>
@@ -38,6 +41,17 @@ let {
 					</div>
 				{/if}
 
+				{#if data.reason === 'expired'}
+					<div
+						role="status"
+						aria-live="polite"
+						class="mb-5 rounded-sm border border-amber-200 bg-amber-50 px-4 py-3 font-sans"
+					>
+						<p class="text-xs font-medium text-amber-900">{m.error_session_expired()}</p>
+						<p class="mt-1 text-xs text-amber-800">{m.error_session_expired_explainer()}</p>
+					</div>
+				{/if}
+
 				<h1 class="mb-6 font-sans text-sm font-bold tracking-widest text-ink uppercase">
 					{m.login_heading()}
 				</h1>
@@ -49,11 +63,13 @@ let {
 							class="mb-1.5 block font-sans text-xs font-bold tracking-widest text-ink-2 uppercase"
 							>{m.login_label_email()}</label
 						>
+						<!-- svelte-ignore a11y_autofocus -->
 						<input
 							type="email"
 							name="email"
 							id="email"
 							required
+							autofocus
 							autocomplete="email"
 							class="block w-full border border-line px-3 py-2.5 font-serif text-sm text-ink placeholder-ink-3 focus:outline-none focus-visible:ring-2 focus-visible:ring-focus-ring"
 						/>
@@ -81,7 +97,7 @@ let {
 
 					<button
 						type="submit"
-						class="mt-2 w-full bg-primary py-2.5 font-sans text-xs font-bold tracking-widest text-primary-fg uppercase transition-colors hover:bg-primary/90"
+						class="mt-2 min-h-[44px] w-full bg-primary py-2.5 font-sans text-xs font-bold tracking-widest text-primary-fg uppercase transition-colors hover:bg-primary/90"
 					>
 						{m.login_btn_submit()}
 					</button>