diff --git a/src/components/user/login-form.tsx b/src/components/user/login-form.tsx
index 8597f0f..a0167e2 100644
--- a/src/components/user/login-form.tsx
+++ b/src/components/user/login-form.tsx
@@ -50,7 +50,7 @@ function LoginFormElement({
   return (
     <form className='flex flex-col gap-5 w-full' onSubmit={onSubmit}>
       <LabeledInput
-        type='email'
+        type='text'
         label='E-Mail or Username'
         placeholder='What you are known as'
         error={formState.errors.email?.message}
diff --git a/src/lib/validation/user.ts b/src/lib/validation/user.ts
index efdc5ea..a2efa5e 100644
--- a/src/lib/validation/user.ts
+++ b/src/lib/validation/user.ts
@@ -4,7 +4,17 @@ export const loginSchema = zod.object({
   email: zod
     .string()
     .email('Invalid email address')
-    .min(3, 'Email is required'),
+    .min(3, 'Email is required')
+    .or(
+      zod
+        .string()
+        .min(3, 'Username is required')
+        .max(32, 'Username must be at most 32 characters long')
+        .regex(
+          /^[a-zA-Z0-9_]+$/,
+          'Username can only contain letters, numbers, and underscores',
+        ),
+    ),
   password: zod.string().min(1, 'Password is required'),
 });