diff --git a/src/login/kcContext/KcContext.ts b/src/login/kcContext/KcContext.ts
index cbe77c3b..b71daaad 100644
--- a/src/login/kcContext/KcContext.ts
+++ b/src/login/kcContext/KcContext.ts
@@ -396,7 +396,6 @@ export declare namespace KcContext {
 
     export type LoginUpdatePassword = Common & {
         pageId: "login-update-password.ftl";
-        username: string;
     };
 
     export type LoginIdpLinkConfirm = Common & {
diff --git a/src/login/pages/LoginUpdatePassword.tsx b/src/login/pages/LoginUpdatePassword.tsx
index a4b8ac17..23c002da 100644
--- a/src/login/pages/LoginUpdatePassword.tsx
+++ b/src/login/pages/LoginUpdatePassword.tsx
@@ -1,4 +1,6 @@
+import { useEffect, useReducer } from "react";
 import { clsx } from "keycloakify/tools/clsx";
+import { assert } from "tsafe/assert";
 import type { PageProps } from "keycloakify/login/pages/PageProps";
 import { useGetClassName } from "keycloakify/login/lib/useGetClassName";
 import type { KcContext } from "../kcContext";
@@ -14,93 +16,83 @@ export default function LoginUpdatePassword(props: PageProps<Extract<KcContext,
 
     const { msg, msgStr } = i18n;
 
-    const { url, messagesPerField, isAppInitiatedAction, username } = kcContext;
+    const { url, messagesPerField, isAppInitiatedAction } = kcContext;
 
     return (
-        <Template {...{ kcContext, i18n, doUseDefaultCss, classes }} headerNode={msg("updatePasswordTitle")}>
+        <Template
+            {...{ kcContext, i18n, doUseDefaultCss, classes }}
+            displayMessage={!messagesPerField.existsError("password", "password-confirm")}
+            headerNode={msg("updatePasswordTitle")}
+        >
             <form id="kc-passwd-update-form" className={getClassName("kcFormClass")} action={url.loginAction} method="post">
-                <input
-                    type="text"
-                    id="username"
-                    name="username"
-                    value={username}
-                    readOnly={true}
-                    autoComplete="username"
-                    style={{ display: "none" }}
-                />
-                <input type="password" id="password" name="password" autoComplete="current-password" style={{ display: "none" }} />
-
-                <div
-                    className={clsx(
-                        getClassName("kcFormGroupClass"),
-                        messagesPerField.printIfExists("password", getClassName("kcFormGroupErrorClass"))
-                    )}
-                >
+                <div className={getClassName("kcFormGroupClass")}>
                     <div className={getClassName("kcLabelWrapperClass")}>
                         <label htmlFor="password-new" className={getClassName("kcLabelClass")}>
                             {msg("passwordNew")}
                         </label>
-                    </div>
-                    <div className={getClassName("kcInputWrapperClass")}>
-                        <input
-                            type="password"
-                            id="password-new"
-                            name="password-new"
-                            autoFocus
-                            autoComplete="new-password"
-                            className={getClassName("kcInputClass")}
-                        />
+                        <div className={getClassName("kcInputWrapperClass")}>
+                            <PasswordWrapper {...{ getClassName, i18n }} passwordInputId="password-new">
+                                <input
+                                    type="password"
+                                    id="password-new"
+                                    name="password-new"
+                                    className={getClassName("kcInputClass")}
+                                    autoFocus
+                                    autoComplete="new-password"
+                                    aria-invalid={messagesPerField.existsError("password", "password-confirm")}
+                                />
+                            </PasswordWrapper>
+
+                            {messagesPerField.existsError("password") && (
+                                <span id="input-error-password" className={getClassName("kcInputErrorMessageClass")} aria-live="polite">
+                                    {messagesPerField.get("password")}
+                                </span>
+                            )}
+                        </div>
                     </div>
                 </div>
 
-                <div
-                    className={clsx(
-                        getClassName("kcFormGroupClass"),
-                        messagesPerField.printIfExists("password-confirm", getClassName("kcFormGroupErrorClass"))
-                    )}
-                >
+                <div className={getClassName("kcFormGroupClass")}>
                     <div className={getClassName("kcLabelWrapperClass")}>
                         <label htmlFor="password-confirm" className={getClassName("kcLabelClass")}>
                             {msg("passwordConfirm")}
                         </label>
                     </div>
                     <div className={getClassName("kcInputWrapperClass")}>
-                        <input
-                            type="password"
-                            id="password-confirm"
-                            name="password-confirm"
-                            autoComplete="new-password"
-                            className={getClassName("kcInputClass")}
-                        />
-                    </div>
-                </div>
+                        <PasswordWrapper {...{ getClassName, i18n }} passwordInputId="password-confirm">
+                            <input
+                                type="password"
+                                id="password-confirm"
+                                name="password-confirm"
+                                className={getClassName("kcInputClass")}
+                                autoFocus
+                                autoComplete="new-password"
+                                aria-invalid={messagesPerField.existsError("password", "password-confirm")}
+                            />
+                        </PasswordWrapper>
 
-                <div className={getClassName("kcFormGroupClass")}>
-                    <div id="kc-form-options" className={getClassName("kcFormOptionsClass")}>
-                        <div className={getClassName("kcFormOptionsWrapperClass")}>
+                        {messagesPerField.existsError("password-confirm") && (
+                            <span id="input-error-password-confirm" className={getClassName("kcInputErrorMessageClass")} aria-live="polite">
+                                {messagesPerField.get("password-confirm")}
+                            </span>
+                        )}
+                    </div>
+
+                    <div className={getClassName("kcFormGroupClass")}>
+                        <LogoutOtherSessions {...{ getClassName, i18n }} />
+
+                        <div id="kc-form-buttons" className={getClassName("kcFormButtonsClass")}>
+                            <input
+                                className={clsx(
+                                    getClassName("kcButtonClass"),
+                                    getClassName("kcButtonPrimaryClass"),
+                                    isAppInitiatedAction && getClassName("kcButtonBlockClass"),
+                                    getClassName("kcButtonLargeClass")
+                                )}
+                                type="submit"
+                                value={msgStr("doSubmit")}
+                            />
                             {isAppInitiatedAction && (
-                                <div className="checkbox">
-                                    <label>
-                                        <input type="checkbox" id="logout-sessions" name="logout-sessions" value="on" checked />
-                                        {msgStr("logoutOtherSessions")}
-                                    </label>
-                                </div>
-                            )}
-                        </div>
-                    </div>
-
-                    <div id="kc-form-buttons" className={getClassName("kcFormButtonsClass")}>
-                        {isAppInitiatedAction ? (
-                            <>
-                                <input
-                                    className={clsx(
-                                        getClassName("kcButtonClass"),
-                                        getClassName("kcButtonPrimaryClass"),
-                                        getClassName("kcButtonLargeClass")
-                                    )}
-                                    type="submit"
-                                    defaultValue={msgStr("doSubmit")}
-                                />
                                 <button
                                     className={clsx(
                                         getClassName("kcButtonClass"),
@@ -113,22 +105,69 @@ export default function LoginUpdatePassword(props: PageProps<Extract<KcContext,
                                 >
                                     {msg("doCancel")}
                                 </button>
-                            </>
-                        ) : (
-                            <input
-                                className={clsx(
-                                    getClassName("kcButtonClass"),
-                                    getClassName("kcButtonPrimaryClass"),
-                                    getClassName("kcButtonBlockClass"),
-                                    getClassName("kcButtonLargeClass")
-                                )}
-                                type="submit"
-                                value={msgStr("doSubmit")}
-                            />
-                        )}
+                            )}
+                        </div>
                     </div>
                 </div>
             </form>
         </Template>
     );
 }
+
+function LogoutOtherSessions(props: { getClassName: ReturnType<typeof useGetClassName>["getClassName"]; i18n: I18n }) {
+    const { getClassName, i18n } = props;
+
+    const { msg } = i18n;
+
+    return (
+        <div id="kc-form-options" className={getClassName("kcFormOptionsClass")}>
+            <div className={getClassName("kcFormOptionsWrapperClass")}>
+                <div className="checkbox">
+                    <label>
+                        <input type="checkbox" id="logout-sessions" name="logout-sessions" value="on" defaultChecked={true} />
+                        {msg("logoutOtherSessions")}
+                    </label>
+                </div>
+            </div>
+        </div>
+    );
+}
+
+function PasswordWrapper(props: {
+    getClassName: ReturnType<typeof useGetClassName>["getClassName"];
+    i18n: I18n;
+    passwordInputId: string;
+    children: JSX.Element;
+}) {
+    const { getClassName, i18n, passwordInputId, children } = props;
+
+    const { msgStr } = i18n;
+
+    const [isPasswordRevealed, toggleIsPasswordRevealed] = useReducer((isPasswordRevealed: boolean) => !isPasswordRevealed, false);
+
+    useEffect(() => {
+        const passwordInputElement = document.getElementById(passwordInputId);
+
+        assert(passwordInputElement instanceof HTMLInputElement);
+
+        passwordInputElement.type = isPasswordRevealed ? "text" : "password";
+    }, [isPasswordRevealed]);
+
+    return (
+        <div className={getClassName("kcInputGroup")}>
+            {children}
+            <button
+                type="button"
+                className={getClassName("kcFormPasswordVisibilityButtonClass")}
+                aria-label={msgStr(isPasswordRevealed ? "hidePassword" : "showPassword")}
+                aria-controls={passwordInputId}
+                onClick={toggleIsPasswordRevealed}
+            >
+                <i
+                    className={getClassName(isPasswordRevealed ? "kcFormPasswordVisibilityIconHide" : "kcFormPasswordVisibilityIconShow")}
+                    aria-hidden
+                />
+            </button>
+        </div>
+    );
+}