diff --git a/.changeset/email-autocomplete-hints.md b/.changeset/email-autocomplete-hints.md
new file mode 100644
index 00000000..ed312c3b
--- /dev/null
+++ b/.changeset/email-autocomplete-hints.md
@@ -0,0 +1,9 @@
+---
+'ePDS': patch
+---
+
+Sign-in and recovery email fields now work more reliably with browser autofill and password managers.
+
+**Affects:** End users
+
+**End users:** email fields now identify themselves to browsers as email addresses, while the same sign-in field identifies itself as a username after switching to handle entry. This helps browsers and password managers offer the right saved value in each mode.
diff --git a/e2e/step-definitions/atproto-login-button.steps.ts b/e2e/step-definitions/atproto-login-button.steps.ts
index f0100ca8..2c34d692 100644
--- a/e2e/step-definitions/atproto-login-button.steps.ts
+++ b/e2e/step-definitions/atproto-login-button.steps.ts
@@ -76,6 +76,7 @@ Then(
     const input = page.locator('#email')
     await expect(input).toHaveAttribute('type', 'text')
     await expect(input).toHaveAttribute('name', 'handle')
+    await expect(input).toHaveAttribute('autocomplete', 'username')
     await expect(input).toHaveAttribute('placeholder', 'you.bsky.social')
     await expect(page.locator('label[for="email"]')).toHaveText('Handle')
   },
@@ -88,6 +89,7 @@ Then(
     const input = page.locator('#email')
     await expect(input).toHaveAttribute('type', 'email')
     await expect(input).toHaveAttribute('name', 'email')
+    await expect(input).toHaveAttribute('autocomplete', 'email')
     await expect(input).toHaveAttribute('placeholder', 'you@example.com')
     await expect(page.locator('label[for="email"]')).toHaveText(
       'Enter your email address',
diff --git a/packages/auth-service/src/routes/account-login.ts b/packages/auth-service/src/routes/account-login.ts
index 7b044ab2..aea686fb 100644
--- a/packages/auth-service/src/routes/account-login.ts
+++ b/packages/auth-service/src/routes/account-login.ts
@@ -157,6 +157,7 @@ function renderLoginForm(opts: { csrfToken: string; error?: string }): string {
         <div class="field">
           <label for="email">Email address</label>
           <input type="email" id="email" name="email" required autofocus
+                 autocomplete="email"
                  placeholder="you@example.com">
         </div>
         <button type="submit" class="btn-primary">Continue with email</button>
diff --git a/packages/auth-service/src/routes/login-page.ts b/packages/auth-service/src/routes/login-page.ts
index 376b6343..4f742773 100644
--- a/packages/auth-service/src/routes/login-page.ts
+++ b/packages/auth-service/src/routes/login-page.ts
@@ -664,6 +664,7 @@ export function renderLoginPage(opts: {
         <div class="field">
           <label for="email">Enter your email address</label>
           <input type="email" id="email" name="email" required autofocus
+                 autocomplete="email"
                  placeholder="you@example.com"
                  value="${escapeHtml(opts.loginHint)}">
         </div>
@@ -1035,6 +1036,7 @@ export function renderLoginPage(opts: {
           emailInput.type = 'text';
           emailInput.placeholder = 'you.bsky.social';
           emailInput.name = 'handle';
+          emailInput.autocomplete = 'username';
           emailInput.value = '';
           // Browser's built-in type="email" validation would block valid
           // handles; remove it for handle mode.
@@ -1046,6 +1048,7 @@ export function renderLoginPage(opts: {
           emailInput.type = 'email';
           emailInput.placeholder = 'you@example.com';
           emailInput.name = 'email';
+          emailInput.autocomplete = 'email';
           emailInput.value = '';
           emailInput.setAttribute('required', '');
           sendOtpBtn.textContent = 'Continue';
diff --git a/packages/auth-service/src/routes/recovery.ts b/packages/auth-service/src/routes/recovery.ts
index ac6ae5df..f5917598 100644
--- a/packages/auth-service/src/routes/recovery.ts
+++ b/packages/auth-service/src/routes/recovery.ts
@@ -348,6 +348,7 @@ export function renderRecoveryForm(opts: {
         <div class="field">
           <label for="email">Backup email address</label>
           <input type="email" id="email" name="email" required autofocus
+                 autocomplete="email"
                  placeholder="backup@example.com">
         </div>
         <button type="submit" class="btn-primary">Send recovery code</button>