diff --git a/src/lib/elements/forms/inputPassword.svelte b/src/lib/elements/forms/inputPassword.svelte
index 6e2d0c7b84..c371fbeeaa 100644
--- a/src/lib/elements/forms/inputPassword.svelte
+++ b/src/lib/elements/forms/inputPassword.svelte
@@ -10,7 +10,7 @@
     export let required = false;
     export let disabled = false;
     export let autofocus = false;
-    export let autocomplete = false;
+    export let autocomplete: boolean | string = false;
     export let minlength = 8;
     export let maxlength: number = null;
     export let leadingIcon: ComponentType | undefined = undefined;
@@ -47,7 +47,11 @@
     {leadingIcon}
     state={error ? 'error' : 'default'}
     autofocus={autofocus || undefined}
-    autocomplete={autocomplete ? 'on' : 'off'}
+    autocomplete={typeof autocomplete === 'string'
+        ? (autocomplete as HTMLInputElement['autocomplete'])
+        : autocomplete
+          ? 'on'
+          : 'off'}
     helper={helper || error}
     on:invalid={handleInvalid}
     bind:value>
diff --git a/src/routes/(public)/recover/+page.svelte b/src/routes/(public)/recover/+page.svelte
index 1fb21d9b81..b331506ef4 100644
--- a/src/routes/(public)/recover/+page.svelte
+++ b/src/routes/(public)/recover/+page.svelte
@@ -13,6 +13,7 @@
     let email: string;
     let userId: string;
     let secret: string;
+    let userEmail: string;
 
     let password: string;
     let confirmPassword: string;
@@ -20,6 +21,7 @@
     onMount(() => {
         userId = page.url.searchParams.get('userId');
         secret = page.url.searchParams.get('secret');
+        userEmail = page.url.searchParams.get('email') || '';
     });
 
     async function recover() {
@@ -76,18 +78,30 @@
         {#if userId && secret}
             <Form onSubmit={setPassword}>
                 <Layout.Stack>
+                    <!-- hidden email input for password managers -->
+                    <input
+                        type="email"
+                        name="email"
+                        value={userEmail}
+                        style="position: absolute; left: -9999px; opacity: 0; pointer-events: none;"
+                        tabindex="-1"
+                        autocomplete="username"
+                        aria-hidden="true" />
+
                     <InputPassword
                         label="New password"
                         placeholder="Enter password"
                         id="password"
                         autofocus={true}
                         required={true}
+                        autocomplete="new-password"
                         bind:value={password} />
                     <InputPassword
                         label="Confirm password"
                         placeholder="Confirm password"
                         id="confirm-password"
                         required={true}
+                        autocomplete="new-password"
                         bind:value={confirmPassword} />
 
                     <Button fullWidth submit>Update</Button>