diff --git a/exercises/07.protecting-routes/03.problem.redirect/README.mdx b/exercises/07.protecting-routes/03.problem.redirect/README.mdx
index ff0a536e4..0675ae438 100644
--- a/exercises/07.protecting-routes/03.problem.redirect/README.mdx
+++ b/exercises/07.protecting-routes/03.problem.redirect/README.mdx
@@ -14,6 +14,9 @@ That way, our `requireUserId` utility can take the `request.url` and create an
 appropriate `redirectTo` query param automatically when it redirects to the
 login page.
 
+🧝‍♂️ Supporting `redirectTo` in `/login` and `/signup` is exactly the same, so
+I'll do the `/signup` route for you. Deal? Cool 👍
+
 We'll also want to update the link from our `/login` page to the `/signup` page
 so if the user needs to create an account instead, the `redirectTo` will carry
 over to that page too.
diff --git a/exercises/07.protecting-routes/03.problem.redirect/app/routes/_auth+/signup.tsx b/exercises/07.protecting-routes/03.problem.redirect/app/routes/_auth+/signup.tsx
index 03c39aa87..558eb8f28 100644
--- a/exercises/07.protecting-routes/03.problem.redirect/app/routes/_auth+/signup.tsx
+++ b/exercises/07.protecting-routes/03.problem.redirect/app/routes/_auth+/signup.tsx
@@ -6,7 +6,8 @@ import {
 	type DataFunctionArgs,
 	type V2_MetaFunction,
 } from '@remix-run/node'
-import { Form, useActionData } from '@remix-run/react'
+import { Form, useActionData, useSearchParams } from '@remix-run/react'
+import { safeRedirect } from 'remix-utils'
 import { z } from 'zod'
 import { CheckboxField, ErrorList, Field } from '~/components/forms.tsx'
 import { Spacer } from '~/components/spacer.tsx'
@@ -38,8 +39,8 @@ const SignupFormSchema = z
 		agreeToTermsOfServiceAndPrivacyPolicy: checkboxSchema(
 			'You must agree to the terms of service and privacy policy',
 		),
-		// 🐨 add config for a redirectTo (optional string)
 		remember: checkboxSchema(),
+		redirectTo: z.string().optional(),
 	})
 	.superRefine(({ confirmPassword, password }, ctx) => {
 		if (confirmPassword !== password) {
@@ -87,15 +88,12 @@ export async function action({ request }: DataFunctionArgs) {
 		return json({ status: 'error', submission } as const, { status: 400 })
 	}
 
-	// 🐨 get the redirectTo from the submission
-	const { user, remember } = submission.value
+	const { user, remember, redirectTo } = submission.value
 
 	const cookieSession = await getSession(request.headers.get('cookie'))
 	cookieSession.set(userIdKey, user.id)
 
-	// 🐨 redirect to the redirectTo
-	// 🦉 Make sure to use the safeRedirect utility from remix-utils
-	return redirect('/', {
+	return redirect(safeRedirect(redirectTo), {
 		headers: {
 			'set-cookie': await commitSession(cookieSession, {
 				expires: remember
@@ -113,13 +111,13 @@ export const meta: V2_MetaFunction = () => {
 export default function SignupRoute() {
 	const actionData = useActionData<typeof action>()
 	const isSubmitting = useIsSubmitting()
-	// 🐨 get the search params via useSearchParams from @remix-run/react
-	// 🐨 get the redirectTo from the search params
+	const [searchParams] = useSearchParams()
+	const redirectTo = searchParams.get('redirectTo')
 
 	const [form, fields] = useForm({
 		id: 'signup-form',
 		constraint: getFieldsetConstraint(SignupFormSchema),
-		// 🐨 add a defaultValues object with the redirectTo
+		defaultValue: { redirectTo },
 		lastSubmission: actionData?.submission,
 		onValidate({ formData }) {
 			return parse(formData, { schema: SignupFormSchema })
@@ -211,7 +209,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					{/* 🐨 add a hidden input here for the redirectTo */}
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 
 					<ErrorList errors={form.errors} id={form.errorId} />
 
diff --git a/exercises/07.protecting-routes/03.solution.redirect/app/routes/_auth+/login.tsx b/exercises/07.protecting-routes/03.solution.redirect/app/routes/_auth+/login.tsx
index 4d94f6326..c034bf797 100644
--- a/exercises/07.protecting-routes/03.solution.redirect/app/routes/_auth+/login.tsx
+++ b/exercises/07.protecting-routes/03.solution.redirect/app/routes/_auth+/login.tsx
@@ -156,7 +156,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/07.protecting-routes/03.solution.redirect/app/routes/_auth+/signup.tsx b/exercises/07.protecting-routes/03.solution.redirect/app/routes/_auth+/signup.tsx
index c0261aea7..28ca7d491 100644
--- a/exercises/07.protecting-routes/03.solution.redirect/app/routes/_auth+/signup.tsx
+++ b/exercises/07.protecting-routes/03.solution.redirect/app/routes/_auth+/signup.tsx
@@ -209,7 +209,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/08.permissions/01.problem.schema/app/routes/_auth+/login.tsx b/exercises/08.permissions/01.problem.schema/app/routes/_auth+/login.tsx
index 4d94f6326..c034bf797 100644
--- a/exercises/08.permissions/01.problem.schema/app/routes/_auth+/login.tsx
+++ b/exercises/08.permissions/01.problem.schema/app/routes/_auth+/login.tsx
@@ -156,7 +156,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/08.permissions/01.problem.schema/app/routes/_auth+/signup.tsx b/exercises/08.permissions/01.problem.schema/app/routes/_auth+/signup.tsx
index c0261aea7..28ca7d491 100644
--- a/exercises/08.permissions/01.problem.schema/app/routes/_auth+/signup.tsx
+++ b/exercises/08.permissions/01.problem.schema/app/routes/_auth+/signup.tsx
@@ -209,7 +209,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/08.permissions/01.solution.schema/app/routes/_auth+/login.tsx b/exercises/08.permissions/01.solution.schema/app/routes/_auth+/login.tsx
index 4d94f6326..c034bf797 100644
--- a/exercises/08.permissions/01.solution.schema/app/routes/_auth+/login.tsx
+++ b/exercises/08.permissions/01.solution.schema/app/routes/_auth+/login.tsx
@@ -156,7 +156,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/08.permissions/01.solution.schema/app/routes/_auth+/signup.tsx b/exercises/08.permissions/01.solution.schema/app/routes/_auth+/signup.tsx
index c0261aea7..28ca7d491 100644
--- a/exercises/08.permissions/01.solution.schema/app/routes/_auth+/signup.tsx
+++ b/exercises/08.permissions/01.solution.schema/app/routes/_auth+/signup.tsx
@@ -209,7 +209,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/08.permissions/02.problem.seed/app/routes/_auth+/login.tsx b/exercises/08.permissions/02.problem.seed/app/routes/_auth+/login.tsx
index 4d94f6326..c034bf797 100644
--- a/exercises/08.permissions/02.problem.seed/app/routes/_auth+/login.tsx
+++ b/exercises/08.permissions/02.problem.seed/app/routes/_auth+/login.tsx
@@ -156,7 +156,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/08.permissions/02.problem.seed/app/routes/_auth+/signup.tsx b/exercises/08.permissions/02.problem.seed/app/routes/_auth+/signup.tsx
index c0261aea7..28ca7d491 100644
--- a/exercises/08.permissions/02.problem.seed/app/routes/_auth+/signup.tsx
+++ b/exercises/08.permissions/02.problem.seed/app/routes/_auth+/signup.tsx
@@ -209,7 +209,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/08.permissions/02.solution.seed/app/routes/_auth+/login.tsx b/exercises/08.permissions/02.solution.seed/app/routes/_auth+/login.tsx
index 4d94f6326..c034bf797 100644
--- a/exercises/08.permissions/02.solution.seed/app/routes/_auth+/login.tsx
+++ b/exercises/08.permissions/02.solution.seed/app/routes/_auth+/login.tsx
@@ -156,7 +156,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/08.permissions/02.solution.seed/app/routes/_auth+/signup.tsx b/exercises/08.permissions/02.solution.seed/app/routes/_auth+/signup.tsx
index c0261aea7..28ca7d491 100644
--- a/exercises/08.permissions/02.solution.seed/app/routes/_auth+/signup.tsx
+++ b/exercises/08.permissions/02.solution.seed/app/routes/_auth+/signup.tsx
@@ -209,7 +209,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/08.permissions/03.problem.delete-note/app/routes/_auth+/login.tsx b/exercises/08.permissions/03.problem.delete-note/app/routes/_auth+/login.tsx
index 4d94f6326..c034bf797 100644
--- a/exercises/08.permissions/03.problem.delete-note/app/routes/_auth+/login.tsx
+++ b/exercises/08.permissions/03.problem.delete-note/app/routes/_auth+/login.tsx
@@ -156,7 +156,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/08.permissions/03.problem.delete-note/app/routes/_auth+/signup.tsx b/exercises/08.permissions/03.problem.delete-note/app/routes/_auth+/signup.tsx
index c0261aea7..28ca7d491 100644
--- a/exercises/08.permissions/03.problem.delete-note/app/routes/_auth+/signup.tsx
+++ b/exercises/08.permissions/03.problem.delete-note/app/routes/_auth+/signup.tsx
@@ -209,7 +209,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/08.permissions/03.solution.delete-note/app/routes/_auth+/login.tsx b/exercises/08.permissions/03.solution.delete-note/app/routes/_auth+/login.tsx
index 4d94f6326..c034bf797 100644
--- a/exercises/08.permissions/03.solution.delete-note/app/routes/_auth+/login.tsx
+++ b/exercises/08.permissions/03.solution.delete-note/app/routes/_auth+/login.tsx
@@ -156,7 +156,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/08.permissions/03.solution.delete-note/app/routes/_auth+/signup.tsx b/exercises/08.permissions/03.solution.delete-note/app/routes/_auth+/signup.tsx
index c0261aea7..28ca7d491 100644
--- a/exercises/08.permissions/03.solution.delete-note/app/routes/_auth+/signup.tsx
+++ b/exercises/08.permissions/03.solution.delete-note/app/routes/_auth+/signup.tsx
@@ -209,7 +209,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/08.permissions/04.problem.utils/app/routes/_auth+/login.tsx b/exercises/08.permissions/04.problem.utils/app/routes/_auth+/login.tsx
index 4d94f6326..c034bf797 100644
--- a/exercises/08.permissions/04.problem.utils/app/routes/_auth+/login.tsx
+++ b/exercises/08.permissions/04.problem.utils/app/routes/_auth+/login.tsx
@@ -156,7 +156,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/08.permissions/04.problem.utils/app/routes/_auth+/signup.tsx b/exercises/08.permissions/04.problem.utils/app/routes/_auth+/signup.tsx
index c0261aea7..28ca7d491 100644
--- a/exercises/08.permissions/04.problem.utils/app/routes/_auth+/signup.tsx
+++ b/exercises/08.permissions/04.problem.utils/app/routes/_auth+/signup.tsx
@@ -209,7 +209,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/08.permissions/04.solution.utils/app/routes/_auth+/login.tsx b/exercises/08.permissions/04.solution.utils/app/routes/_auth+/login.tsx
index 4d94f6326..c034bf797 100644
--- a/exercises/08.permissions/04.solution.utils/app/routes/_auth+/login.tsx
+++ b/exercises/08.permissions/04.solution.utils/app/routes/_auth+/login.tsx
@@ -156,7 +156,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/08.permissions/04.solution.utils/app/routes/_auth+/signup.tsx b/exercises/08.permissions/04.solution.utils/app/routes/_auth+/signup.tsx
index c0261aea7..28ca7d491 100644
--- a/exercises/08.permissions/04.solution.utils/app/routes/_auth+/signup.tsx
+++ b/exercises/08.permissions/04.solution.utils/app/routes/_auth+/signup.tsx
@@ -209,7 +209,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/09.managed-sessions/01.problem.schema/app/routes/_auth+/login.tsx b/exercises/09.managed-sessions/01.problem.schema/app/routes/_auth+/login.tsx
index 4d94f6326..c034bf797 100644
--- a/exercises/09.managed-sessions/01.problem.schema/app/routes/_auth+/login.tsx
+++ b/exercises/09.managed-sessions/01.problem.schema/app/routes/_auth+/login.tsx
@@ -156,7 +156,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/09.managed-sessions/01.problem.schema/app/routes/_auth+/signup.tsx b/exercises/09.managed-sessions/01.problem.schema/app/routes/_auth+/signup.tsx
index c0261aea7..28ca7d491 100644
--- a/exercises/09.managed-sessions/01.problem.schema/app/routes/_auth+/signup.tsx
+++ b/exercises/09.managed-sessions/01.problem.schema/app/routes/_auth+/signup.tsx
@@ -209,7 +209,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/09.managed-sessions/01.solution.schema/app/routes/_auth+/login.tsx b/exercises/09.managed-sessions/01.solution.schema/app/routes/_auth+/login.tsx
index 4d94f6326..c034bf797 100644
--- a/exercises/09.managed-sessions/01.solution.schema/app/routes/_auth+/login.tsx
+++ b/exercises/09.managed-sessions/01.solution.schema/app/routes/_auth+/login.tsx
@@ -156,7 +156,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/09.managed-sessions/01.solution.schema/app/routes/_auth+/signup.tsx b/exercises/09.managed-sessions/01.solution.schema/app/routes/_auth+/signup.tsx
index c0261aea7..28ca7d491 100644
--- a/exercises/09.managed-sessions/01.solution.schema/app/routes/_auth+/signup.tsx
+++ b/exercises/09.managed-sessions/01.solution.schema/app/routes/_auth+/signup.tsx
@@ -209,7 +209,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/09.managed-sessions/02.problem.auth-utils/app/routes/_auth+/login.tsx b/exercises/09.managed-sessions/02.problem.auth-utils/app/routes/_auth+/login.tsx
index 4d94f6326..c034bf797 100644
--- a/exercises/09.managed-sessions/02.problem.auth-utils/app/routes/_auth+/login.tsx
+++ b/exercises/09.managed-sessions/02.problem.auth-utils/app/routes/_auth+/login.tsx
@@ -156,7 +156,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/09.managed-sessions/02.problem.auth-utils/app/routes/_auth+/signup.tsx b/exercises/09.managed-sessions/02.problem.auth-utils/app/routes/_auth+/signup.tsx
index c0261aea7..28ca7d491 100644
--- a/exercises/09.managed-sessions/02.problem.auth-utils/app/routes/_auth+/signup.tsx
+++ b/exercises/09.managed-sessions/02.problem.auth-utils/app/routes/_auth+/signup.tsx
@@ -209,7 +209,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/09.managed-sessions/02.solution.auth-utils/app/routes/_auth+/login.tsx b/exercises/09.managed-sessions/02.solution.auth-utils/app/routes/_auth+/login.tsx
index 4d94f6326..c034bf797 100644
--- a/exercises/09.managed-sessions/02.solution.auth-utils/app/routes/_auth+/login.tsx
+++ b/exercises/09.managed-sessions/02.solution.auth-utils/app/routes/_auth+/login.tsx
@@ -156,7 +156,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/09.managed-sessions/02.solution.auth-utils/app/routes/_auth+/signup.tsx b/exercises/09.managed-sessions/02.solution.auth-utils/app/routes/_auth+/signup.tsx
index c0261aea7..28ca7d491 100644
--- a/exercises/09.managed-sessions/02.solution.auth-utils/app/routes/_auth+/signup.tsx
+++ b/exercises/09.managed-sessions/02.solution.auth-utils/app/routes/_auth+/signup.tsx
@@ -209,7 +209,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/09.managed-sessions/03.problem.session-cookie/app/routes/_auth+/login.tsx b/exercises/09.managed-sessions/03.problem.session-cookie/app/routes/_auth+/login.tsx
index 9f804e428..6f20650b0 100644
--- a/exercises/09.managed-sessions/03.problem.session-cookie/app/routes/_auth+/login.tsx
+++ b/exercises/09.managed-sessions/03.problem.session-cookie/app/routes/_auth+/login.tsx
@@ -164,7 +164,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/09.managed-sessions/03.problem.session-cookie/app/routes/_auth+/signup.tsx b/exercises/09.managed-sessions/03.problem.session-cookie/app/routes/_auth+/signup.tsx
index 36ca25d89..20c72b7ec 100644
--- a/exercises/09.managed-sessions/03.problem.session-cookie/app/routes/_auth+/signup.tsx
+++ b/exercises/09.managed-sessions/03.problem.session-cookie/app/routes/_auth+/signup.tsx
@@ -216,7 +216,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/09.managed-sessions/03.solution.session-cookie/app/routes/_auth+/login.tsx b/exercises/09.managed-sessions/03.solution.session-cookie/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/09.managed-sessions/03.solution.session-cookie/app/routes/_auth+/login.tsx
+++ b/exercises/09.managed-sessions/03.solution.session-cookie/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/09.managed-sessions/03.solution.session-cookie/app/routes/_auth+/signup.tsx b/exercises/09.managed-sessions/03.solution.session-cookie/app/routes/_auth+/signup.tsx
index 08e4a286a..902e5c43b 100644
--- a/exercises/09.managed-sessions/03.solution.session-cookie/app/routes/_auth+/signup.tsx
+++ b/exercises/09.managed-sessions/03.solution.session-cookie/app/routes/_auth+/signup.tsx
@@ -202,7 +202,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/09.managed-sessions/04.problem.delete-sessions/app/routes/_auth+/login.tsx b/exercises/09.managed-sessions/04.problem.delete-sessions/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/09.managed-sessions/04.problem.delete-sessions/app/routes/_auth+/login.tsx
+++ b/exercises/09.managed-sessions/04.problem.delete-sessions/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/09.managed-sessions/04.problem.delete-sessions/app/routes/_auth+/signup.tsx b/exercises/09.managed-sessions/04.problem.delete-sessions/app/routes/_auth+/signup.tsx
index 08e4a286a..902e5c43b 100644
--- a/exercises/09.managed-sessions/04.problem.delete-sessions/app/routes/_auth+/signup.tsx
+++ b/exercises/09.managed-sessions/04.problem.delete-sessions/app/routes/_auth+/signup.tsx
@@ -202,7 +202,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/09.managed-sessions/04.solution.delete-sessions/app/routes/_auth+/login.tsx b/exercises/09.managed-sessions/04.solution.delete-sessions/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/09.managed-sessions/04.solution.delete-sessions/app/routes/_auth+/login.tsx
+++ b/exercises/09.managed-sessions/04.solution.delete-sessions/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/09.managed-sessions/04.solution.delete-sessions/app/routes/_auth+/signup.tsx b/exercises/09.managed-sessions/04.solution.delete-sessions/app/routes/_auth+/signup.tsx
index 08e4a286a..902e5c43b 100644
--- a/exercises/09.managed-sessions/04.solution.delete-sessions/app/routes/_auth+/signup.tsx
+++ b/exercises/09.managed-sessions/04.solution.delete-sessions/app/routes/_auth+/signup.tsx
@@ -202,7 +202,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/10.email/01.problem.resend/app/routes/_auth+/login.tsx b/exercises/10.email/01.problem.resend/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/10.email/01.problem.resend/app/routes/_auth+/login.tsx
+++ b/exercises/10.email/01.problem.resend/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/10.email/01.problem.resend/app/routes/_auth+/signup.tsx b/exercises/10.email/01.problem.resend/app/routes/_auth+/signup.tsx
index 08e4a286a..902e5c43b 100644
--- a/exercises/10.email/01.problem.resend/app/routes/_auth+/signup.tsx
+++ b/exercises/10.email/01.problem.resend/app/routes/_auth+/signup.tsx
@@ -202,7 +202,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/10.email/01.solution.resend/app/routes/_auth+/login.tsx b/exercises/10.email/01.solution.resend/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/10.email/01.solution.resend/app/routes/_auth+/login.tsx
+++ b/exercises/10.email/01.solution.resend/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/10.email/01.solution.resend/app/routes/_auth+/signup.tsx b/exercises/10.email/01.solution.resend/app/routes/_auth+/signup.tsx
index 08e4a286a..902e5c43b 100644
--- a/exercises/10.email/01.solution.resend/app/routes/_auth+/signup.tsx
+++ b/exercises/10.email/01.solution.resend/app/routes/_auth+/signup.tsx
@@ -202,7 +202,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/10.email/02.problem.mocks/app/routes/_auth+/login.tsx b/exercises/10.email/02.problem.mocks/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/10.email/02.problem.mocks/app/routes/_auth+/login.tsx
+++ b/exercises/10.email/02.problem.mocks/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/10.email/02.problem.mocks/app/routes/_auth+/signup.tsx b/exercises/10.email/02.problem.mocks/app/routes/_auth+/signup.tsx
index 08e4a286a..902e5c43b 100644
--- a/exercises/10.email/02.problem.mocks/app/routes/_auth+/signup.tsx
+++ b/exercises/10.email/02.problem.mocks/app/routes/_auth+/signup.tsx
@@ -202,7 +202,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/10.email/02.solution.mocks/app/routes/_auth+/login.tsx b/exercises/10.email/02.solution.mocks/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/10.email/02.solution.mocks/app/routes/_auth+/login.tsx
+++ b/exercises/10.email/02.solution.mocks/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/10.email/02.solution.mocks/app/routes/_auth+/signup.tsx b/exercises/10.email/02.solution.mocks/app/routes/_auth+/signup.tsx
index 08e4a286a..902e5c43b 100644
--- a/exercises/10.email/02.solution.mocks/app/routes/_auth+/signup.tsx
+++ b/exercises/10.email/02.solution.mocks/app/routes/_auth+/signup.tsx
@@ -202,7 +202,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/10.email/03.problem.send/app/routes/_auth+/login.tsx b/exercises/10.email/03.problem.send/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/10.email/03.problem.send/app/routes/_auth+/login.tsx
+++ b/exercises/10.email/03.problem.send/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/10.email/03.problem.send/app/routes/_auth+/onboarding.tsx b/exercises/10.email/03.problem.send/app/routes/_auth+/onboarding.tsx
index 454f185f3..7e84a07ea 100644
--- a/exercises/10.email/03.problem.send/app/routes/_auth+/onboarding.tsx
+++ b/exercises/10.email/03.problem.send/app/routes/_auth+/onboarding.tsx
@@ -203,7 +203,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/10.email/03.solution.send/app/routes/_auth+/login.tsx b/exercises/10.email/03.solution.send/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/10.email/03.solution.send/app/routes/_auth+/login.tsx
+++ b/exercises/10.email/03.solution.send/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/10.email/03.solution.send/app/routes/_auth+/onboarding.tsx b/exercises/10.email/03.solution.send/app/routes/_auth+/onboarding.tsx
index 454f185f3..7e84a07ea 100644
--- a/exercises/10.email/03.solution.send/app/routes/_auth+/onboarding.tsx
+++ b/exercises/10.email/03.solution.send/app/routes/_auth+/onboarding.tsx
@@ -203,7 +203,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/10.email/04.problem.session/app/routes/_auth+/login.tsx b/exercises/10.email/04.problem.session/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/10.email/04.problem.session/app/routes/_auth+/login.tsx
+++ b/exercises/10.email/04.problem.session/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/10.email/04.problem.session/app/routes/_auth+/onboarding.tsx b/exercises/10.email/04.problem.session/app/routes/_auth+/onboarding.tsx
index 6242bd305..a9ea99696 100644
--- a/exercises/10.email/04.problem.session/app/routes/_auth+/onboarding.tsx
+++ b/exercises/10.email/04.problem.session/app/routes/_auth+/onboarding.tsx
@@ -218,7 +218,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/10.email/04.solution.session/app/routes/_auth+/login.tsx b/exercises/10.email/04.solution.session/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/10.email/04.solution.session/app/routes/_auth+/login.tsx
+++ b/exercises/10.email/04.solution.session/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/10.email/04.solution.session/app/routes/_auth+/onboarding.tsx b/exercises/10.email/04.solution.session/app/routes/_auth+/onboarding.tsx
index 00df26eba..5cefdbdaa 100644
--- a/exercises/10.email/04.solution.session/app/routes/_auth+/onboarding.tsx
+++ b/exercises/10.email/04.solution.session/app/routes/_auth+/onboarding.tsx
@@ -218,7 +218,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/11.verification/01.problem.schema/app/routes/_auth+/login.tsx b/exercises/11.verification/01.problem.schema/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/11.verification/01.problem.schema/app/routes/_auth+/login.tsx
+++ b/exercises/11.verification/01.problem.schema/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/11.verification/01.problem.schema/app/routes/_auth+/onboarding.tsx b/exercises/11.verification/01.problem.schema/app/routes/_auth+/onboarding.tsx
index 00df26eba..5cefdbdaa 100644
--- a/exercises/11.verification/01.problem.schema/app/routes/_auth+/onboarding.tsx
+++ b/exercises/11.verification/01.problem.schema/app/routes/_auth+/onboarding.tsx
@@ -218,7 +218,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/11.verification/01.solution.schema/app/routes/_auth+/login.tsx b/exercises/11.verification/01.solution.schema/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/11.verification/01.solution.schema/app/routes/_auth+/login.tsx
+++ b/exercises/11.verification/01.solution.schema/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/11.verification/01.solution.schema/app/routes/_auth+/onboarding.tsx b/exercises/11.verification/01.solution.schema/app/routes/_auth+/onboarding.tsx
index 00df26eba..5cefdbdaa 100644
--- a/exercises/11.verification/01.solution.schema/app/routes/_auth+/onboarding.tsx
+++ b/exercises/11.verification/01.solution.schema/app/routes/_auth+/onboarding.tsx
@@ -218,7 +218,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/11.verification/02.problem.totp/app/routes/_auth+/login.tsx b/exercises/11.verification/02.problem.totp/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/11.verification/02.problem.totp/app/routes/_auth+/login.tsx
+++ b/exercises/11.verification/02.problem.totp/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/11.verification/02.problem.totp/app/routes/_auth+/onboarding.tsx b/exercises/11.verification/02.problem.totp/app/routes/_auth+/onboarding.tsx
index 00df26eba..5cefdbdaa 100644
--- a/exercises/11.verification/02.problem.totp/app/routes/_auth+/onboarding.tsx
+++ b/exercises/11.verification/02.problem.totp/app/routes/_auth+/onboarding.tsx
@@ -218,7 +218,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/11.verification/02.solution.totp/app/routes/_auth+/login.tsx b/exercises/11.verification/02.solution.totp/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/11.verification/02.solution.totp/app/routes/_auth+/login.tsx
+++ b/exercises/11.verification/02.solution.totp/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/11.verification/02.solution.totp/app/routes/_auth+/onboarding.tsx b/exercises/11.verification/02.solution.totp/app/routes/_auth+/onboarding.tsx
index 00df26eba..5cefdbdaa 100644
--- a/exercises/11.verification/02.solution.totp/app/routes/_auth+/onboarding.tsx
+++ b/exercises/11.verification/02.solution.totp/app/routes/_auth+/onboarding.tsx
@@ -218,7 +218,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/11.verification/03.problem.verify-code/app/routes/_auth+/login.tsx b/exercises/11.verification/03.problem.verify-code/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/11.verification/03.problem.verify-code/app/routes/_auth+/login.tsx
+++ b/exercises/11.verification/03.problem.verify-code/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/11.verification/03.problem.verify-code/app/routes/_auth+/onboarding.tsx b/exercises/11.verification/03.problem.verify-code/app/routes/_auth+/onboarding.tsx
index 00df26eba..5cefdbdaa 100644
--- a/exercises/11.verification/03.problem.verify-code/app/routes/_auth+/onboarding.tsx
+++ b/exercises/11.verification/03.problem.verify-code/app/routes/_auth+/onboarding.tsx
@@ -218,7 +218,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/11.verification/03.solution.verify-code/app/routes/_auth+/login.tsx b/exercises/11.verification/03.solution.verify-code/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/11.verification/03.solution.verify-code/app/routes/_auth+/login.tsx
+++ b/exercises/11.verification/03.solution.verify-code/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/11.verification/03.solution.verify-code/app/routes/_auth+/onboarding.tsx b/exercises/11.verification/03.solution.verify-code/app/routes/_auth+/onboarding.tsx
index 00df26eba..5cefdbdaa 100644
--- a/exercises/11.verification/03.solution.verify-code/app/routes/_auth+/onboarding.tsx
+++ b/exercises/11.verification/03.solution.verify-code/app/routes/_auth+/onboarding.tsx
@@ -218,7 +218,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/12.reset-password/01.problem.handle-verification/app/routes/_auth+/login.tsx b/exercises/12.reset-password/01.problem.handle-verification/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/12.reset-password/01.problem.handle-verification/app/routes/_auth+/login.tsx
+++ b/exercises/12.reset-password/01.problem.handle-verification/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/12.reset-password/01.problem.handle-verification/app/routes/_auth+/onboarding.tsx b/exercises/12.reset-password/01.problem.handle-verification/app/routes/_auth+/onboarding.tsx
index 49039b8e4..7775db117 100644
--- a/exercises/12.reset-password/01.problem.handle-verification/app/routes/_auth+/onboarding.tsx
+++ b/exercises/12.reset-password/01.problem.handle-verification/app/routes/_auth+/onboarding.tsx
@@ -235,7 +235,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/12.reset-password/01.solution.handle-verification/app/routes/_auth+/login.tsx b/exercises/12.reset-password/01.solution.handle-verification/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/12.reset-password/01.solution.handle-verification/app/routes/_auth+/login.tsx
+++ b/exercises/12.reset-password/01.solution.handle-verification/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/12.reset-password/01.solution.handle-verification/app/routes/_auth+/onboarding.tsx b/exercises/12.reset-password/01.solution.handle-verification/app/routes/_auth+/onboarding.tsx
index 49039b8e4..7775db117 100644
--- a/exercises/12.reset-password/01.solution.handle-verification/app/routes/_auth+/onboarding.tsx
+++ b/exercises/12.reset-password/01.solution.handle-verification/app/routes/_auth+/onboarding.tsx
@@ -235,7 +235,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/12.reset-password/02.problem.reset-password/app/routes/_auth+/login.tsx b/exercises/12.reset-password/02.problem.reset-password/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/12.reset-password/02.problem.reset-password/app/routes/_auth+/login.tsx
+++ b/exercises/12.reset-password/02.problem.reset-password/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/12.reset-password/02.problem.reset-password/app/routes/_auth+/onboarding.tsx b/exercises/12.reset-password/02.problem.reset-password/app/routes/_auth+/onboarding.tsx
index 49039b8e4..7775db117 100644
--- a/exercises/12.reset-password/02.problem.reset-password/app/routes/_auth+/onboarding.tsx
+++ b/exercises/12.reset-password/02.problem.reset-password/app/routes/_auth+/onboarding.tsx
@@ -235,7 +235,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/12.reset-password/02.solution.reset-password/app/routes/_auth+/login.tsx b/exercises/12.reset-password/02.solution.reset-password/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/12.reset-password/02.solution.reset-password/app/routes/_auth+/login.tsx
+++ b/exercises/12.reset-password/02.solution.reset-password/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/12.reset-password/02.solution.reset-password/app/routes/_auth+/onboarding.tsx b/exercises/12.reset-password/02.solution.reset-password/app/routes/_auth+/onboarding.tsx
index 49039b8e4..7775db117 100644
--- a/exercises/12.reset-password/02.solution.reset-password/app/routes/_auth+/onboarding.tsx
+++ b/exercises/12.reset-password/02.solution.reset-password/app/routes/_auth+/onboarding.tsx
@@ -235,7 +235,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/13.change-email/01.problem.totp/app/routes/_auth+/login.tsx b/exercises/13.change-email/01.problem.totp/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/13.change-email/01.problem.totp/app/routes/_auth+/login.tsx
+++ b/exercises/13.change-email/01.problem.totp/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/13.change-email/01.problem.totp/app/routes/_auth+/onboarding.tsx b/exercises/13.change-email/01.problem.totp/app/routes/_auth+/onboarding.tsx
index 49039b8e4..7775db117 100644
--- a/exercises/13.change-email/01.problem.totp/app/routes/_auth+/onboarding.tsx
+++ b/exercises/13.change-email/01.problem.totp/app/routes/_auth+/onboarding.tsx
@@ -235,7 +235,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/13.change-email/01.solution.totp/app/routes/_auth+/login.tsx b/exercises/13.change-email/01.solution.totp/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/13.change-email/01.solution.totp/app/routes/_auth+/login.tsx
+++ b/exercises/13.change-email/01.solution.totp/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/13.change-email/01.solution.totp/app/routes/_auth+/onboarding.tsx b/exercises/13.change-email/01.solution.totp/app/routes/_auth+/onboarding.tsx
index 49039b8e4..7775db117 100644
--- a/exercises/13.change-email/01.solution.totp/app/routes/_auth+/onboarding.tsx
+++ b/exercises/13.change-email/01.solution.totp/app/routes/_auth+/onboarding.tsx
@@ -235,7 +235,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/13.change-email/02.problem.handle-verification/app/routes/_auth+/login.tsx b/exercises/13.change-email/02.problem.handle-verification/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/13.change-email/02.problem.handle-verification/app/routes/_auth+/login.tsx
+++ b/exercises/13.change-email/02.problem.handle-verification/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/13.change-email/02.problem.handle-verification/app/routes/_auth+/onboarding.tsx b/exercises/13.change-email/02.problem.handle-verification/app/routes/_auth+/onboarding.tsx
index 49039b8e4..7775db117 100644
--- a/exercises/13.change-email/02.problem.handle-verification/app/routes/_auth+/onboarding.tsx
+++ b/exercises/13.change-email/02.problem.handle-verification/app/routes/_auth+/onboarding.tsx
@@ -235,7 +235,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/13.change-email/02.solution.handle-verification/app/routes/_auth+/login.tsx b/exercises/13.change-email/02.solution.handle-verification/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/13.change-email/02.solution.handle-verification/app/routes/_auth+/login.tsx
+++ b/exercises/13.change-email/02.solution.handle-verification/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/13.change-email/02.solution.handle-verification/app/routes/_auth+/onboarding.tsx b/exercises/13.change-email/02.solution.handle-verification/app/routes/_auth+/onboarding.tsx
index 49039b8e4..7775db117 100644
--- a/exercises/13.change-email/02.solution.handle-verification/app/routes/_auth+/onboarding.tsx
+++ b/exercises/13.change-email/02.solution.handle-verification/app/routes/_auth+/onboarding.tsx
@@ -235,7 +235,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/14.enable-2fa/01.problem.init/app/routes/_auth+/login.tsx b/exercises/14.enable-2fa/01.problem.init/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/14.enable-2fa/01.problem.init/app/routes/_auth+/login.tsx
+++ b/exercises/14.enable-2fa/01.problem.init/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/14.enable-2fa/01.problem.init/app/routes/_auth+/onboarding.tsx b/exercises/14.enable-2fa/01.problem.init/app/routes/_auth+/onboarding.tsx
index 49039b8e4..7775db117 100644
--- a/exercises/14.enable-2fa/01.problem.init/app/routes/_auth+/onboarding.tsx
+++ b/exercises/14.enable-2fa/01.problem.init/app/routes/_auth+/onboarding.tsx
@@ -235,7 +235,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/14.enable-2fa/01.solution.init/app/routes/_auth+/login.tsx b/exercises/14.enable-2fa/01.solution.init/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/14.enable-2fa/01.solution.init/app/routes/_auth+/login.tsx
+++ b/exercises/14.enable-2fa/01.solution.init/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/14.enable-2fa/01.solution.init/app/routes/_auth+/onboarding.tsx b/exercises/14.enable-2fa/01.solution.init/app/routes/_auth+/onboarding.tsx
index 49039b8e4..7775db117 100644
--- a/exercises/14.enable-2fa/01.solution.init/app/routes/_auth+/onboarding.tsx
+++ b/exercises/14.enable-2fa/01.solution.init/app/routes/_auth+/onboarding.tsx
@@ -235,7 +235,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/14.enable-2fa/02.problem.qr-code/app/routes/_auth+/login.tsx b/exercises/14.enable-2fa/02.problem.qr-code/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/14.enable-2fa/02.problem.qr-code/app/routes/_auth+/login.tsx
+++ b/exercises/14.enable-2fa/02.problem.qr-code/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/14.enable-2fa/02.problem.qr-code/app/routes/_auth+/onboarding.tsx b/exercises/14.enable-2fa/02.problem.qr-code/app/routes/_auth+/onboarding.tsx
index 49039b8e4..7775db117 100644
--- a/exercises/14.enable-2fa/02.problem.qr-code/app/routes/_auth+/onboarding.tsx
+++ b/exercises/14.enable-2fa/02.problem.qr-code/app/routes/_auth+/onboarding.tsx
@@ -235,7 +235,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/14.enable-2fa/02.solution.qr-code/app/routes/_auth+/login.tsx b/exercises/14.enable-2fa/02.solution.qr-code/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/14.enable-2fa/02.solution.qr-code/app/routes/_auth+/login.tsx
+++ b/exercises/14.enable-2fa/02.solution.qr-code/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/14.enable-2fa/02.solution.qr-code/app/routes/_auth+/onboarding.tsx b/exercises/14.enable-2fa/02.solution.qr-code/app/routes/_auth+/onboarding.tsx
index 49039b8e4..7775db117 100644
--- a/exercises/14.enable-2fa/02.solution.qr-code/app/routes/_auth+/onboarding.tsx
+++ b/exercises/14.enable-2fa/02.solution.qr-code/app/routes/_auth+/onboarding.tsx
@@ -235,7 +235,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/14.enable-2fa/03.problem.verify/app/routes/_auth+/login.tsx b/exercises/14.enable-2fa/03.problem.verify/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/14.enable-2fa/03.problem.verify/app/routes/_auth+/login.tsx
+++ b/exercises/14.enable-2fa/03.problem.verify/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/14.enable-2fa/03.problem.verify/app/routes/_auth+/onboarding.tsx b/exercises/14.enable-2fa/03.problem.verify/app/routes/_auth+/onboarding.tsx
index 49039b8e4..7775db117 100644
--- a/exercises/14.enable-2fa/03.problem.verify/app/routes/_auth+/onboarding.tsx
+++ b/exercises/14.enable-2fa/03.problem.verify/app/routes/_auth+/onboarding.tsx
@@ -235,7 +235,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/14.enable-2fa/03.solution.verify/app/routes/_auth+/login.tsx b/exercises/14.enable-2fa/03.solution.verify/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/14.enable-2fa/03.solution.verify/app/routes/_auth+/login.tsx
+++ b/exercises/14.enable-2fa/03.solution.verify/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/14.enable-2fa/03.solution.verify/app/routes/_auth+/onboarding.tsx b/exercises/14.enable-2fa/03.solution.verify/app/routes/_auth+/onboarding.tsx
index 49039b8e4..7775db117 100644
--- a/exercises/14.enable-2fa/03.solution.verify/app/routes/_auth+/onboarding.tsx
+++ b/exercises/14.enable-2fa/03.solution.verify/app/routes/_auth+/onboarding.tsx
@@ -235,7 +235,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/15.verify-2fa/01.problem.unverified/app/routes/_auth+/login.tsx b/exercises/15.verify-2fa/01.problem.unverified/app/routes/_auth+/login.tsx
index ec11989e1..ff727eaa4 100644
--- a/exercises/15.verify-2fa/01.problem.unverified/app/routes/_auth+/login.tsx
+++ b/exercises/15.verify-2fa/01.problem.unverified/app/routes/_auth+/login.tsx
@@ -149,7 +149,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/15.verify-2fa/01.problem.unverified/app/routes/_auth+/onboarding.tsx b/exercises/15.verify-2fa/01.problem.unverified/app/routes/_auth+/onboarding.tsx
index 49039b8e4..7775db117 100644
--- a/exercises/15.verify-2fa/01.problem.unverified/app/routes/_auth+/onboarding.tsx
+++ b/exercises/15.verify-2fa/01.problem.unverified/app/routes/_auth+/onboarding.tsx
@@ -235,7 +235,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/15.verify-2fa/01.solution.unverified/app/routes/_auth+/login.tsx b/exercises/15.verify-2fa/01.solution.unverified/app/routes/_auth+/login.tsx
index 6e82b2d1b..4485d120f 100644
--- a/exercises/15.verify-2fa/01.solution.unverified/app/routes/_auth+/login.tsx
+++ b/exercises/15.verify-2fa/01.solution.unverified/app/routes/_auth+/login.tsx
@@ -180,7 +180,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/15.verify-2fa/01.solution.unverified/app/routes/_auth+/onboarding.tsx b/exercises/15.verify-2fa/01.solution.unverified/app/routes/_auth+/onboarding.tsx
index 49039b8e4..7775db117 100644
--- a/exercises/15.verify-2fa/01.solution.unverified/app/routes/_auth+/onboarding.tsx
+++ b/exercises/15.verify-2fa/01.solution.unverified/app/routes/_auth+/onboarding.tsx
@@ -235,7 +235,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/15.verify-2fa/02.problem.verify/app/routes/_auth+/login.tsx b/exercises/15.verify-2fa/02.problem.verify/app/routes/_auth+/login.tsx
index 6e82b2d1b..4485d120f 100644
--- a/exercises/15.verify-2fa/02.problem.verify/app/routes/_auth+/login.tsx
+++ b/exercises/15.verify-2fa/02.problem.verify/app/routes/_auth+/login.tsx
@@ -180,7 +180,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/15.verify-2fa/02.problem.verify/app/routes/_auth+/onboarding.tsx b/exercises/15.verify-2fa/02.problem.verify/app/routes/_auth+/onboarding.tsx
index 49039b8e4..7775db117 100644
--- a/exercises/15.verify-2fa/02.problem.verify/app/routes/_auth+/onboarding.tsx
+++ b/exercises/15.verify-2fa/02.problem.verify/app/routes/_auth+/onboarding.tsx
@@ -235,7 +235,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/15.verify-2fa/02.solution.verify/app/routes/_auth+/login.tsx b/exercises/15.verify-2fa/02.solution.verify/app/routes/_auth+/login.tsx
index b45d72868..54046a160 100644
--- a/exercises/15.verify-2fa/02.solution.verify/app/routes/_auth+/login.tsx
+++ b/exercises/15.verify-2fa/02.solution.verify/app/routes/_auth+/login.tsx
@@ -204,7 +204,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/15.verify-2fa/02.solution.verify/app/routes/_auth+/onboarding.tsx b/exercises/15.verify-2fa/02.solution.verify/app/routes/_auth+/onboarding.tsx
index 49039b8e4..7775db117 100644
--- a/exercises/15.verify-2fa/02.solution.verify/app/routes/_auth+/onboarding.tsx
+++ b/exercises/15.verify-2fa/02.solution.verify/app/routes/_auth+/onboarding.tsx
@@ -235,7 +235,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/16.2fa-check/01.problem.delete/app/routes/_auth+/login.tsx b/exercises/16.2fa-check/01.problem.delete/app/routes/_auth+/login.tsx
index b45d72868..54046a160 100644
--- a/exercises/16.2fa-check/01.problem.delete/app/routes/_auth+/login.tsx
+++ b/exercises/16.2fa-check/01.problem.delete/app/routes/_auth+/login.tsx
@@ -204,7 +204,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/16.2fa-check/01.problem.delete/app/routes/_auth+/onboarding.tsx b/exercises/16.2fa-check/01.problem.delete/app/routes/_auth+/onboarding.tsx
index 49039b8e4..7775db117 100644
--- a/exercises/16.2fa-check/01.problem.delete/app/routes/_auth+/onboarding.tsx
+++ b/exercises/16.2fa-check/01.problem.delete/app/routes/_auth+/onboarding.tsx
@@ -235,7 +235,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/16.2fa-check/01.solution.delete/app/routes/_auth+/login.tsx b/exercises/16.2fa-check/01.solution.delete/app/routes/_auth+/login.tsx
index b45d72868..54046a160 100644
--- a/exercises/16.2fa-check/01.solution.delete/app/routes/_auth+/login.tsx
+++ b/exercises/16.2fa-check/01.solution.delete/app/routes/_auth+/login.tsx
@@ -204,7 +204,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/16.2fa-check/01.solution.delete/app/routes/_auth+/onboarding.tsx b/exercises/16.2fa-check/01.solution.delete/app/routes/_auth+/onboarding.tsx
index 49039b8e4..7775db117 100644
--- a/exercises/16.2fa-check/01.solution.delete/app/routes/_auth+/onboarding.tsx
+++ b/exercises/16.2fa-check/01.solution.delete/app/routes/_auth+/onboarding.tsx
@@ -235,7 +235,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/16.2fa-check/02.problem.reverify/app/routes/_auth+/login.tsx b/exercises/16.2fa-check/02.problem.reverify/app/routes/_auth+/login.tsx
index b45d72868..54046a160 100644
--- a/exercises/16.2fa-check/02.problem.reverify/app/routes/_auth+/login.tsx
+++ b/exercises/16.2fa-check/02.problem.reverify/app/routes/_auth+/login.tsx
@@ -204,7 +204,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/16.2fa-check/02.problem.reverify/app/routes/_auth+/onboarding.tsx b/exercises/16.2fa-check/02.problem.reverify/app/routes/_auth+/onboarding.tsx
index 49039b8e4..7775db117 100644
--- a/exercises/16.2fa-check/02.problem.reverify/app/routes/_auth+/onboarding.tsx
+++ b/exercises/16.2fa-check/02.problem.reverify/app/routes/_auth+/onboarding.tsx
@@ -235,7 +235,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/16.2fa-check/02.solution.reverify/app/routes/_auth+/login.tsx b/exercises/16.2fa-check/02.solution.reverify/app/routes/_auth+/login.tsx
index 80b2ebae1..672d799d7 100644
--- a/exercises/16.2fa-check/02.solution.reverify/app/routes/_auth+/login.tsx
+++ b/exercises/16.2fa-check/02.solution.reverify/app/routes/_auth+/login.tsx
@@ -230,7 +230,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/16.2fa-check/02.solution.reverify/app/routes/_auth+/onboarding.tsx b/exercises/16.2fa-check/02.solution.reverify/app/routes/_auth+/onboarding.tsx
index 49039b8e4..7775db117 100644
--- a/exercises/16.2fa-check/02.solution.reverify/app/routes/_auth+/onboarding.tsx
+++ b/exercises/16.2fa-check/02.solution.reverify/app/routes/_auth+/onboarding.tsx
@@ -235,7 +235,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/16.2fa-check/03.problem.change-email/app/routes/_auth+/login.tsx b/exercises/16.2fa-check/03.problem.change-email/app/routes/_auth+/login.tsx
index 80b2ebae1..672d799d7 100644
--- a/exercises/16.2fa-check/03.problem.change-email/app/routes/_auth+/login.tsx
+++ b/exercises/16.2fa-check/03.problem.change-email/app/routes/_auth+/login.tsx
@@ -230,7 +230,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/16.2fa-check/03.problem.change-email/app/routes/_auth+/onboarding.tsx b/exercises/16.2fa-check/03.problem.change-email/app/routes/_auth+/onboarding.tsx
index 49039b8e4..7775db117 100644
--- a/exercises/16.2fa-check/03.problem.change-email/app/routes/_auth+/onboarding.tsx
+++ b/exercises/16.2fa-check/03.problem.change-email/app/routes/_auth+/onboarding.tsx
@@ -235,7 +235,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">
diff --git a/exercises/16.2fa-check/03.solution.change-email/app/routes/_auth+/login.tsx b/exercises/16.2fa-check/03.solution.change-email/app/routes/_auth+/login.tsx
index 80b2ebae1..672d799d7 100644
--- a/exercises/16.2fa-check/03.solution.change-email/app/routes/_auth+/login.tsx
+++ b/exercises/16.2fa-check/03.solution.change-email/app/routes/_auth+/login.tsx
@@ -230,7 +230,9 @@ export default function LoginPage() {
 								</div>
 							</div>
 
-							<input {...conform.input(fields.redirectTo)} type="hidden" />
+							<input
+								{...conform.input(fields.redirectTo, { type: 'hidden' })}
+							/>
 							<ErrorList errors={form.errors} id={form.errorId} />
 
 							<div className="flex items-center justify-between gap-6 pt-3">
diff --git a/exercises/16.2fa-check/03.solution.change-email/app/routes/_auth+/onboarding.tsx b/exercises/16.2fa-check/03.solution.change-email/app/routes/_auth+/onboarding.tsx
index 49039b8e4..7775db117 100644
--- a/exercises/16.2fa-check/03.solution.change-email/app/routes/_auth+/onboarding.tsx
+++ b/exercises/16.2fa-check/03.solution.change-email/app/routes/_auth+/onboarding.tsx
@@ -235,7 +235,7 @@ export default function SignupRoute() {
 						errors={fields.remember.errors}
 					/>
 
-					<input {...conform.input(fields.redirectTo)} type="hidden" />
+					<input {...conform.input(fields.redirectTo, { type: 'hidden' })} />
 					<ErrorList errors={form.errors} id={form.errorId} />
 
 					<div className="flex items-center justify-between gap-6">