diff --git a/app/routes/_auth+/onboarding.tsx b/app/routes/_auth+/onboarding.tsx
index aaa12a0..072ecee 100644
--- a/app/routes/_auth+/onboarding.tsx
+++ b/app/routes/_auth+/onboarding.tsx
@@ -173,6 +173,7 @@ export default function OnboardingPage() {
 							htmlFor: fields.username.id,
 							children: 'Username',
 						}}
+						description="Used for logging in (cannot be an email address)"
 						inputProps={{
 							...conform.input(fields.username),
 							autoComplete: 'username',
@@ -181,7 +182,6 @@ export default function OnboardingPage() {
 								typeof fields.username.initialError !== 'undefined',
 						}}
 						errors={fields.username.errors}
-						description="Cannot be an email address"
 					/>
 					<Field
 						labelProps={{ htmlFor: fields.name.id, children: 'Full Name' }}
diff --git a/app/utils/user-validation.ts b/app/utils/user-validation.ts
index 54f1d43..35ed90e 100644
--- a/app/utils/user-validation.ts
+++ b/app/utils/user-validation.ts
@@ -16,7 +16,7 @@ export const passwordSchema = z
 
 export const nameSchema = z
 	.string()
-	.min(3, { message: 'Name is too short' })
+	.min(2, { message: 'Name is too short' })
 	.max(40, { message: 'Name is too long' })
 
 export const emailSchema = z
diff --git a/tests/e2e/onboarding.test.ts b/tests/e2e/onboarding.test.ts
index ed73e34..55c0de2 100644
--- a/tests/e2e/onboarding.test.ts
+++ b/tests/e2e/onboarding.test.ts
@@ -74,7 +74,9 @@ test('onboarding with link', async ({ page }) => {
 		.getByRole('textbox', { name: /^username/i })
 		.fill(onboardingData.username)
 
-	await page.getByRole('textbox', { name: /^name/i }).fill(onboardingData.name)
+	await page
+		.getByRole('textbox', { name: /^full name/i })
+		.fill(onboardingData.name)
 
 	await page
 		.getByRole('textbox', { name: /number/i })