diff --git a/packages/libeufin-bank-webui/src/pages/account/UpdateAccountPassword.tsx b/packages/libeufin-bank-webui/src/pages/account/UpdateAccountPassword.tsx
index fa2403bdf..f1fd6d1c9 100644
--- a/packages/libeufin-bank-webui/src/pages/account/UpdateAccountPassword.tsx
+++ b/packages/libeufin-bank-webui/src/pages/account/UpdateAccountPassword.tsx
@@ -35,6 +35,7 @@ import { useBankChallengeHandlerContext } from "../../context/challenge.js";
 import { useSessionState } from "../../hooks/session.js";
 import { OperationError } from "../../components/OperationError.js";
 import { undefinedIfEmpty } from "../../utils.js";
+import { doAutoFocus } from "../PaytoWireTransferForm.js";
 import { ProfileNavigation } from "../ProfileNavigation.js";
 
 export function UpdateAccountPassword({
@@ -202,6 +203,7 @@ export function UpdateAccountPassword({
                   </label>
                   <div class="mt-2">
                     <input
+                      ref={doAutoFocus}
                       type="password"
                       class="block w-full rounded-md border-0 py-1.5 text-onBackground shadow-sm ring-1 ring-inset ring-gray-300 data-[error=true]:ring-red-500 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-primary sm:text-sm sm:leading-6"
                       name="current"
@@ -236,6 +238,9 @@ export function UpdateAccountPassword({
                 </label>
                 <div class="mt-2">
                   <input
+                    // An administrator resetting another account's password
+                    // is not asked for the current one.
+                    ref={accountIsTheCurrentUser ? undefined : doAutoFocus}
                     type="password"
                     class="block w-full rounded-md border-0 py-1.5 text-onBackground shadow-sm ring-1 ring-inset ring-gray-300 data-[error=true]:ring-red-500 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-primary sm:text-sm sm:leading-6"
                     name="password"