diff --git a/CHANGELOG.md b/CHANGELOG.md
index babb4c09..3c613bce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+- Enable browser assisted autofill for username and password.[#696](https://github.com/sourcebot-dev/sourcebot/pull/696)
+
 ## [4.10.5] - 2025-12-23
 
 ### Changed
diff --git a/packages/web/src/app/login/components/credentialsForm.tsx b/packages/web/src/app/login/components/credentialsForm.tsx
index 339e5b19..47508862 100644
--- a/packages/web/src/app/login/components/credentialsForm.tsx
+++ b/packages/web/src/app/login/components/credentialsForm.tsx
@@ -55,7 +55,11 @@ export const CredentialsForm = ({ callbackUrl, context }: CredentialsFormProps)
                         <FormItem className="mb-4">
                             <FormLabel>Email</FormLabel>
                             <FormControl>
-                                <Input placeholder="email@example.com" {...field} />
+                                <Input
+                                    placeholder="email@example.com"
+                                    autoComplete="email"
+                                    {...field}
+                                />
                             </FormControl>
                             <FormMessage />
                         </FormItem>
@@ -68,7 +72,11 @@ export const CredentialsForm = ({ callbackUrl, context }: CredentialsFormProps)
                         <FormItem className="mb-8">
                             <FormLabel>Password</FormLabel>
                             <FormControl>
-                                <Input type="password" {...field} />
+                                <Input
+                                    type="password"
+                                    autoComplete={context === "signup" ? "new-password" : "current-password"}
+                                    {...field}
+                                />
                             </FormControl>
                             <FormMessage />
                         </FormItem>