diff --git a/src/routes/(token-based)/+layout.server.ts b/src/routes/(token-based)/+layout.server.ts
index 91f89b1..b712f22 100644
--- a/src/routes/(token-based)/+layout.server.ts
+++ b/src/routes/(token-based)/+layout.server.ts
@@ -20,5 +20,5 @@ export const load: PageServerLoad = async ({ params, url, locals }) => {
 	const isVorgangValid = vorgangExists(caseId);
 	const isTokenValid = tokenValid(caseId, caseToken);
 
-	if (!isVorgangValid || !isTokenValid) throw redirect(303, `/anmeldung`);
+	if (!isVorgangValid || !isTokenValid) throw redirect(303, `/anmeldung?vorgang=${caseId}`);
 };
diff --git a/src/routes/anmeldung/+page.svelte b/src/routes/anmeldung/+page.svelte
index f937a51..cc1e0fb 100644
--- a/src/routes/anmeldung/+page.svelte
+++ b/src/routes/anmeldung/+page.svelte
@@ -11,6 +11,9 @@
 	export let form;
 
 	export let open = false;
+
+	import { page } from '$app/state';
+	const vorgang_token = page.url.searchParams.get('vorgang');
 </script>
 
 <div class="flex min-h-full flex-col justify-center px-6 py-12 lg:px-8">
@@ -30,7 +33,7 @@
 						name="case-id"
 						label="Vorgangskennung"
 						type="text"
-						value={form?.caseId}
+						value={vorgang_token}
 					/>
 					<div class="mt-5">
 						<BaseInputField