diff --git a/apps/website/app/routes/_index.tsx b/apps/website/app/routes/_index.tsx
index 7e8df9cb38..29423458b9 100644
--- a/apps/website/app/routes/_index.tsx
+++ b/apps/website/app/routes/_index.tsx
@@ -139,9 +139,7 @@ export const action = async ({ request }: ActionFunctionArgs) => {
 		.run();
 };
 
-const intentSchema = z.object({ intent: z.string() });
-
-const emailSchema = z.object({ email: z.string().email() }).merge(intentSchema);
+const emailSchema = z.object({ email: z.string().email() });
 
 const registerSchema = z
 	.object({ otpCode: z.string().length(6) })
@@ -302,7 +300,7 @@ export default function Page() {
 								<Form
 									method="POST"
 									className="flex gap-2 flex-none"
-									action={withQuery(".", {
+									action={withQuery(".?index", {
 										intent: loaderData.query.email
 											? "registerWithEmail"
 											: "sendLoginCode",
@@ -348,7 +346,7 @@ export default function Page() {
 								<p className="text-xs">OR</p>
 								<Form
 									method="POST"
-									action={withQuery(".", { intent: "registerWithOidc" })}
+									action={withQuery(".?index", { intent: "registerWithOidc" })}
 								>
 									<Button
 										variant="outline"
@@ -440,7 +438,7 @@ export default function Page() {
 					) : (
 						<Form
 							method="POST"
-							action={withQuery(".", { intent: "contactSubmission" })}
+							action={withQuery(".?index", { intent: "contactSubmission" })}
 							className="flex flex-col items-center justify-center pt-12 gap-y-4 gap-x-4"
 						>
 							<HoneypotInputs />
diff --git a/apps/website/package.json b/apps/website/package.json
index b62f0aa14c..c17cf6f71d 100644
--- a/apps/website/package.json
+++ b/apps/website/package.json
@@ -49,6 +49,7 @@
 		"sonner": "1.5.0",
 		"tailwind-merge": "2.5.4",
 		"tailwindcss-animate": "1.0.7",
+		"tiny-invariant": "1.3.3",
 		"ts-pattern": "5.5.0",
 		"ufo": "1.5.4",
 		"zod": "3.23.8",
diff --git a/yarn.lock b/yarn.lock
index 2d77a6599e..f14dc3ddc5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6305,6 +6305,7 @@ __metadata:
     tailwind-merge: "npm:2.5.4"
     tailwindcss: "npm:3.4.14"
     tailwindcss-animate: "npm:1.0.7"
+    tiny-invariant: "npm:1.3.3"
     ts-pattern: "npm:5.5.0"
     typescript: "npm:5.6.3"
     typescript-remix-routes-plugin: "npm:1.0.1"