diff --git a/src/routes/(auth)/auth/(components)/login-form.svelte b/src/routes/(auth)/auth/(components)/login-form.svelte
index 132e806..5b569ea 100644
--- a/src/routes/(auth)/auth/(components)/login-form.svelte
+++ b/src/routes/(auth)/auth/(components)/login-form.svelte
@@ -32,10 +32,10 @@
 	>
 		<div class="grid gap-2">
 			<div class="grid gap-2">
-				<Label for="email-username">Email or username</Label>
+				<Label for="emailUsername">Email or username</Label>
 				<Input
-					id="email-login"
-					name="email-username"
+					id="emailUsername"
+					name="emailUsername"
 					type="text"
 					autocapitalize="none"
 					autocomplete="email"
@@ -45,7 +45,7 @@
 			</div>
 			<div class="grid gap-2">
 				<Label for="password">Password</Label>
-				<Input id="password-login" name="password" type="password" disabled={isLoading} />
+				<Input id="password" name="password" type="password" disabled={isLoading} />
 			</div>
 			<Button type="submit" disabled={isLoading}>
 				{#if isLoading}
diff --git a/src/routes/(auth)/auth/(components)/register-form.svelte b/src/routes/(auth)/auth/(components)/register-form.svelte
index b71ba1d..3baeda4 100644
--- a/src/routes/(auth)/auth/(components)/register-form.svelte
+++ b/src/routes/(auth)/auth/(components)/register-form.svelte
@@ -34,7 +34,7 @@
       <div class="grid gap-2">
         <Label for="email">Email</Label>
         <Input
-          id="email-register"
+          id="email"
           name="email"
           type="email"
           autocapitalize="none"
@@ -45,12 +45,12 @@
       </div>
       <div class="grid gap-2">
         <Label for="password">Password</Label>
-        <Input id="password-register" name="password" type="password" disabled={isLoading} />
+        <Input id="password" name="password" type="password" disabled={isLoading} />
       </div>
       <div class="grid gap-2">
-        <Label for="password">Confirm password</Label>
+        <Label for="passwordConfirm">Confirm password</Label>
         <Input
-          id="confirm-password-register"
+          id="passwordConfirm"
           name="passwordConfirm"
           type="password"
           disabled={isLoading}
diff --git a/src/routes/(auth)/auth/+page.server.ts b/src/routes/(auth)/auth/+page.server.ts
index aa1c564..9649e65 100644
--- a/src/routes/(auth)/auth/+page.server.ts
+++ b/src/routes/(auth)/auth/+page.server.ts
@@ -13,9 +13,9 @@ export const actions = {
 	}) => {
 		const body = Object.fromEntries(await request.formData());
 		try {
-			const email = body.email.toString();
+			const emailUsername = body.emailUsername.toString();
 			const password = body.password.toString();
-			await locals.pocketBase.collection('users').authWithPassword(email, password);
+			await locals.pocketBase.collection('users').authWithPassword(emailUsername, password);
 			if (!locals.pocketBase?.authStore?.model?.verified) {
 				locals.pocketBase.authStore.clear();
 				return {