diff --git a/web/src/lib/components/login-card.svelte b/web/src/lib/components/login-card.svelte
index d285a35..e28e9e6 100644
--- a/web/src/lib/components/login-card.svelte
+++ b/web/src/lib/components/login-card.svelte
@@ -121,6 +121,7 @@
 					placeholder="m@example.com"
 					required
 					type="email"
+					autocomplete="email"
 				/>
 			</div>
 			<div class="grid gap-2">
@@ -130,7 +131,7 @@
 						Forgot your password?
 					</a>
 				</div>
-				<Input bind:value={password} id="password" required type="password" />
+				<Input bind:value={password} id="password" required type="password" autocomplete="current-password" />
 			</div>
 
 			{#if errorMessage}
@@ -168,4 +169,3 @@
 		</div>
 	</Card.Content>
 </Card.Root>
-
diff --git a/web/src/lib/components/signup-card.svelte b/web/src/lib/components/signup-card.svelte
index 0c2100a..712900a 100644
--- a/web/src/lib/components/signup-card.svelte
+++ b/web/src/lib/components/signup-card.svelte
@@ -18,7 +18,7 @@
 	let errorMessage = $state('');
 	let successMessage = $state('');
 	let isLoading = $state(false);
-
+	let confirmPassword = $state('');
 	let {
 		oauthProvider
 	}: {
@@ -89,11 +89,16 @@
 					placeholder="m@example.com"
 					required
 					type="email"
+					autocomplete="email"
 				/>
 			</div>
 			<div class="grid gap-2">
 				<Label for="password">Password</Label>
-				<Input bind:value={password} id="password" required type="password" />
+				<Input bind:value={password} id="password" required type="password" autocomplete="new-password" />
+			</div>
+			<div class="grid gap-2">
+				<Label for="password">Confirm Password</Label>
+				<Input bind:value={confirmPassword} id="confirm-password" required type="password" autocomplete="new-password" />
 			</div>
 			{#if errorMessage}
 				<Alert.Root variant="destructive">
@@ -112,7 +117,7 @@
 			{#if isLoading}
 				<LoadingBar />
 			{/if}
-			<Button class="w-full" disabled={isLoading} type="submit">Create an account</Button>
+			<Button class="w-full" disabled={isLoading||password!==confirmPassword||password===''} type="submit">Create an account</Button>
 		</form>
 		{#await oauthProvider}
 			<LoadingBar />