diff --git a/src/lib/components/Error.tsx b/src/lib/components/Error.tsx
index 298bff06..06fcee6b 100644
--- a/src/lib/components/Error.tsx
+++ b/src/lib/components/Error.tsx
@@ -1,40 +1,43 @@
 import React, { memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import type { I18n } from "../i18n";
 
-const Error = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.Error; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
-        const { message, client } = kcContext;
+export type ErrorProps = KcProps & {
+    kcContext: KcContextBase.Error;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
 
-        const { msg } = i18n;
+const Error = memo((props: ErrorProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
 
-        return (
-            <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
-                displayMessage={false}
-                headerNode={msg("errorTitle")}
-                formNode={
-                    <div id="kc-error-message">
-                        <p className="instruction">{message.summary}</p>
-                        {client !== undefined && client.baseUrl !== undefined && (
-                            <p>
-                                <a id="backToApplication" href={client.baseUrl}>
-                                    {msg("backToApplication")}
-                                </a>
-                            </p>
-                        )}
-                    </div>
-                }
-            />
-        );
-    }
-);
+    const { message, client } = kcContext;
+
+    const { msg } = i18n;
+
+    return (
+        <Template
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
+            displayMessage={false}
+            headerNode={msg("errorTitle")}
+            formNode={
+                <div id="kc-error-message">
+                    <p className="instruction">{message.summary}</p>
+                    {client !== undefined && client.baseUrl !== undefined && (
+                        <p>
+                            <a id="backToApplication" href={client.baseUrl}>
+                                {msg("backToApplication")}
+                            </a>
+                        </p>
+                    )}
+                </div>
+            }
+        />
+    );
+});
 
 export default Error;
diff --git a/src/lib/components/IdpReviewUserProfile.tsx b/src/lib/components/IdpReviewUserProfile.tsx
index 840fc009..6fc5e757 100644
--- a/src/lib/components/IdpReviewUserProfile.tsx
+++ b/src/lib/components/IdpReviewUserProfile.tsx
@@ -1,57 +1,60 @@
 import React, { useState, memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 import { UserProfileFormFields } from "./shared/UserProfileCommons";
 
-const IdpReviewUserProfile = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.IdpReviewUserProfile; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
-        const { cx } = useCssAndCx();
+export type IdpReviewUserProfileProps = KcProps & {
+    kcContext: KcContextBase.IdpReviewUserProfile;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
 
-        const { msg, msgStr } = i18n;
+const IdpReviewUserProfile = memo((props: IdpReviewUserProfileProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
 
-        const { url } = kcContext;
+    const { cx } = useCssAndCx();
 
-        const [isFomSubmittable, setIsFomSubmittable] = useState(false);
+    const { msg, msgStr } = i18n;
 
-        return (
-            <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
-                headerNode={msg("loginIdpReviewProfileTitle")}
-                formNode={
-                    <form id="kc-idp-review-profile-form" className={cx(props.kcFormClass)} action={url.loginAction} method="post">
-                        <UserProfileFormFields kcContext={kcContext} onIsFormSubmittableValueChange={setIsFomSubmittable} i18n={i18n} {...props} />
+    const { url } = kcContext;
 
-                        <div className={cx(props.kcFormGroupClass)}>
-                            <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
-                                <div className={cx(props.kcFormOptionsWrapperClass)} />
-                            </div>
-                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
-                                <input
-                                    className={cx(
-                                        props.kcButtonClass,
-                                        props.kcButtonPrimaryClass,
-                                        props.kcButtonBlockClass,
-                                        props.kcButtonLargeClass
-                                    )}
-                                    type="submit"
-                                    value={msgStr("doSubmit")}
-                                    disabled={!isFomSubmittable}
-                                />
-                            </div>
+    const [isFomSubmittable, setIsFomSubmittable] = useState(false);
+
+    return (
+        <Template
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
+            headerNode={msg("loginIdpReviewProfileTitle")}
+            formNode={
+                <form id="kc-idp-review-profile-form" className={cx(kcProps.kcFormClass)} action={url.loginAction} method="post">
+                    <UserProfileFormFields kcContext={kcContext} onIsFormSubmittableValueChange={setIsFomSubmittable} i18n={i18n} {...kcProps} />
+
+                    <div className={cx(kcProps.kcFormGroupClass)}>
+                        <div id="kc-form-options" className={cx(kcProps.kcFormOptionsClass)}>
+                            <div className={cx(kcProps.kcFormOptionsWrapperClass)} />
                         </div>
-                    </form>
-                }
-            />
-        );
-    }
-);
+                        <div id="kc-form-buttons" className={cx(kcProps.kcFormButtonsClass)}>
+                            <input
+                                className={cx(
+                                    kcProps.kcButtonClass,
+                                    kcProps.kcButtonPrimaryClass,
+                                    kcProps.kcButtonBlockClass,
+                                    kcProps.kcButtonLargeClass
+                                )}
+                                type="submit"
+                                value={msgStr("doSubmit")}
+                                disabled={!isFomSubmittable}
+                            />
+                        </div>
+                    </div>
+                </form>
+            }
+        />
+    );
+});
 
 export default IdpReviewUserProfile;
diff --git a/src/lib/components/Info.tsx b/src/lib/components/Info.tsx
index 5cbf1c9d..851327c5 100644
--- a/src/lib/components/Info.tsx
+++ b/src/lib/components/Info.tsx
@@ -1,57 +1,60 @@
 import React, { memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import { assert } from "../tools/assert";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import type { I18n } from "../i18n";
 
-const Info = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.Info; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
-        const { msgStr, msg } = i18n;
+export type InfoProps = KcProps & {
+    kcContext: KcContextBase.Info;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
 
-        assert(kcContext.message !== undefined);
+const Info = memo((props: InfoProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
 
-        const { messageHeader, message, requiredActions, skipLink, pageRedirectUri, actionUri, client } = kcContext;
+    const { msgStr, msg } = i18n;
 
-        return (
-            <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
-                displayMessage={false}
-                headerNode={messageHeader !== undefined ? <>{messageHeader}</> : <>{message.summary}</>}
-                formNode={
-                    <div id="kc-info-message">
-                        <p className="instruction">
-                            {message.summary}
+    assert(kcContext.message !== undefined);
 
-                            {requiredActions !== undefined && (
-                                <b>{requiredActions.map(requiredAction => msgStr(`requiredAction.${requiredAction}` as const)).join(",")}</b>
-                            )}
-                        </p>
-                        {!skipLink && pageRedirectUri !== undefined ? (
-                            <p>
-                                <a href={pageRedirectUri}>{msg("backToApplication")}</a>
-                            </p>
-                        ) : actionUri !== undefined ? (
-                            <p>
-                                <a href={actionUri}>{msg("proceedWithAction")}</a>
-                            </p>
-                        ) : (
-                            client.baseUrl !== undefined && (
-                                <p>
-                                    <a href={client.baseUrl}>{msg("backToApplication")}</a>
-                                </p>
-                            )
+    const { messageHeader, message, requiredActions, skipLink, pageRedirectUri, actionUri, client } = kcContext;
+
+    return (
+        <Template
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
+            displayMessage={false}
+            headerNode={messageHeader !== undefined ? <>{messageHeader}</> : <>{message.summary}</>}
+            formNode={
+                <div id="kc-info-message">
+                    <p className="instruction">
+                        {message.summary}
+
+                        {requiredActions !== undefined && (
+                            <b>{requiredActions.map(requiredAction => msgStr(`requiredAction.${requiredAction}` as const)).join(",")}</b>
                         )}
-                    </div>
-                }
-            />
-        );
-    }
-);
+                    </p>
+                    {!skipLink && pageRedirectUri !== undefined ? (
+                        <p>
+                            <a href={pageRedirectUri}>{msg("backToApplication")}</a>
+                        </p>
+                    ) : actionUri !== undefined ? (
+                        <p>
+                            <a href={actionUri}>{msg("proceedWithAction")}</a>
+                        </p>
+                    ) : (
+                        client.baseUrl !== undefined && (
+                            <p>
+                                <a href={client.baseUrl}>{msg("backToApplication")}</a>
+                            </p>
+                        )
+                    )}
+                </div>
+            }
+        />
+    );
+});
 
 export default Info;
diff --git a/src/lib/components/KcApp.tsx b/src/lib/components/KcApp.tsx
index 0a3dbc09..08a39da8 100644
--- a/src/lib/components/KcApp.tsx
+++ b/src/lib/components/KcApp.tsx
@@ -3,6 +3,8 @@ import type { KcContextBase } from "../getKcContext/KcContextBase";
 import type { KcProps } from "./KcProps";
 import { __unsafe_useI18n as useI18n } from "../i18n";
 import type { I18n } from "../i18n";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 
 const Login = lazy(() => import("./Login"));
 const Register = lazy(() => import("./Register"));
@@ -26,79 +28,82 @@ const LogoutConfirm = lazy(() => import("./LogoutConfirm"));
 const UpdateUserProfile = lazy(() => import("./UpdateUserProfile"));
 const IdpReviewUserProfile = lazy(() => import("./IdpReviewUserProfile"));
 
-const KcApp = memo(
-    ({
-        kcContext,
-        i18n: userProvidedI18n,
-        ...kcProps
-    }: { kcContext: KcContextBase; i18n?: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
-        const i18n = (function useClosure() {
-            const i18n = useI18n({
-                kcContext,
-                "extraMessages": {},
-                "doSkip": userProvidedI18n !== undefined
-            });
+export type KcAppProps = KcProps & {
+    kcContext: KcContextBase;
+    i18n?: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template: (props: TemplateProps) => JSX.Element | null;
+};
 
-            return userProvidedI18n ?? i18n;
-        })();
+const KcApp = memo((props_: KcAppProps) => {
+    const { kcContext, i18n: userProvidedI18n, Template = DefaultTemplate, ...kcProps } = props_;
 
-        if (i18n === null) {
-            return null;
-        }
+    const i18n = (function useClosure() {
+        const i18n = useI18n({
+            kcContext,
+            "extraMessages": {},
+            "doSkip": userProvidedI18n !== undefined
+        });
 
-        const props = { i18n, ...kcProps };
+        return userProvidedI18n ?? i18n;
+    })();
 
-        return (
-            <Suspense>
-                {(() => {
-                    switch (kcContext.pageId) {
-                        case "login.ftl":
-                            return <Login {...{ kcContext, ...props }} />;
-                        case "register.ftl":
-                            return <Register {...{ kcContext, ...props }} />;
-                        case "register-user-profile.ftl":
-                            return <RegisterUserProfile {...{ kcContext, ...props }} />;
-                        case "info.ftl":
-                            return <Info {...{ kcContext, ...props }} />;
-                        case "error.ftl":
-                            return <Error {...{ kcContext, ...props }} />;
-                        case "login-reset-password.ftl":
-                            return <LoginResetPassword {...{ kcContext, ...props }} />;
-                        case "login-verify-email.ftl":
-                            return <LoginVerifyEmail {...{ kcContext, ...props }} />;
-                        case "terms.ftl":
-                            return <Terms {...{ kcContext, ...props }} />;
-                        case "login-otp.ftl":
-                            return <LoginOtp {...{ kcContext, ...props }} />;
-                        case "login-username.ftl":
-                            return <LoginUsername {...{ kcContext, ...props }} />;
-                        case "login-password.ftl":
-                            return <LoginPassword {...{ kcContext, ...props }} />;
-                        case "webauthn-authenticate.ftl":
-                            return <WebauthnAuthenticate {...{ kcContext, ...props }} />;
-                        case "login-update-password.ftl":
-                            return <LoginUpdatePassword {...{ kcContext, ...props }} />;
-                        case "login-update-profile.ftl":
-                            return <LoginUpdateProfile {...{ kcContext, ...props }} />;
-                        case "login-idp-link-confirm.ftl":
-                            return <LoginIdpLinkConfirm {...{ kcContext, ...props }} />;
-                        case "login-idp-link-email.ftl":
-                            return <LoginIdpLinkEmail {...{ kcContext, ...props }} />;
-                        case "login-page-expired.ftl":
-                            return <LoginPageExpired {...{ kcContext, ...props }} />;
-                        case "login-config-totp.ftl":
-                            return <LoginConfigTotp {...{ kcContext, ...props }} />;
-                        case "logout-confirm.ftl":
-                            return <LogoutConfirm {...{ kcContext, ...props }} />;
-                        case "update-user-profile.ftl":
-                            return <UpdateUserProfile {...{ kcContext, ...props }} />;
-                        case "idp-review-user-profile.ftl":
-                            return <IdpReviewUserProfile {...{ kcContext, ...props }} />;
-                    }
-                })()}
-            </Suspense>
-        );
+    if (i18n === null) {
+        return null;
     }
-);
+
+    const commonProps = { i18n, Template, ...kcProps };
+
+    return (
+        <Suspense>
+            {(() => {
+                switch (kcContext.pageId) {
+                    case "login.ftl":
+                        return <Login {...{ kcContext, ...commonProps }} />;
+                    case "register.ftl":
+                        return <Register {...{ kcContext, ...commonProps }} />;
+                    case "register-user-profile.ftl":
+                        return <RegisterUserProfile {...{ kcContext, ...commonProps }} />;
+                    case "info.ftl":
+                        return <Info {...{ kcContext, ...commonProps }} />;
+                    case "error.ftl":
+                        return <Error {...{ kcContext, ...commonProps }} />;
+                    case "login-reset-password.ftl":
+                        return <LoginResetPassword {...{ kcContext, ...commonProps }} />;
+                    case "login-verify-email.ftl":
+                        return <LoginVerifyEmail {...{ kcContext, ...commonProps }} />;
+                    case "terms.ftl":
+                        return <Terms {...{ kcContext, ...commonProps }} />;
+                    case "login-otp.ftl":
+                        return <LoginOtp {...{ kcContext, ...commonProps }} />;
+                    case "login-username.ftl":
+                        return <LoginUsername {...{ kcContext, ...commonProps }} />;
+                    case "login-password.ftl":
+                        return <LoginPassword {...{ kcContext, ...commonProps }} />;
+                    case "webauthn-authenticate.ftl":
+                        return <WebauthnAuthenticate {...{ kcContext, ...commonProps }} />;
+                    case "login-update-password.ftl":
+                        return <LoginUpdatePassword {...{ kcContext, ...commonProps }} />;
+                    case "login-update-profile.ftl":
+                        return <LoginUpdateProfile {...{ kcContext, ...commonProps }} />;
+                    case "login-idp-link-confirm.ftl":
+                        return <LoginIdpLinkConfirm {...{ kcContext, ...commonProps }} />;
+                    case "login-idp-link-email.ftl":
+                        return <LoginIdpLinkEmail {...{ kcContext, ...commonProps }} />;
+                    case "login-page-expired.ftl":
+                        return <LoginPageExpired {...{ kcContext, ...commonProps }} />;
+                    case "login-config-totp.ftl":
+                        return <LoginConfigTotp {...{ kcContext, ...commonProps }} />;
+                    case "logout-confirm.ftl":
+                        return <LogoutConfirm {...{ kcContext, ...commonProps }} />;
+                    case "update-user-profile.ftl":
+                        return <UpdateUserProfile {...{ kcContext, ...commonProps }} />;
+                    case "idp-review-user-profile.ftl":
+                        return <IdpReviewUserProfile {...{ kcContext, ...commonProps }} />;
+                }
+            })()}
+        </Suspense>
+    );
+});
 
 export default KcApp;
diff --git a/src/lib/components/Login.tsx b/src/lib/components/Login.tsx
index a8402234..53a0f211 100644
--- a/src/lib/components/Login.tsx
+++ b/src/lib/components/Login.tsx
@@ -1,5 +1,6 @@
 import React, { useState, memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
@@ -7,197 +8,199 @@ import { useConstCallback } from "powerhooks/useConstCallback";
 import type { FormEventHandler } from "react";
 import type { I18n } from "../i18n";
 
-const Login = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.Login; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
-        const { social, realm, url, usernameEditDisabled, login, auth, registrationDisabled } = kcContext;
+export type LoginProps = KcProps & {
+    kcContext: KcContextBase.Login;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
 
-        const { msg, msgStr } = i18n;
+const Login = memo((props: LoginProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
 
-        const { cx } = useCssAndCx();
+    const { social, realm, url, usernameEditDisabled, login, auth, registrationDisabled } = kcContext;
 
-        const [isLoginButtonDisabled, setIsLoginButtonDisabled] = useState(false);
+    const { msg, msgStr } = i18n;
 
-        const onSubmit = useConstCallback<FormEventHandler<HTMLFormElement>>(e => {
-            e.preventDefault();
+    const { cx } = useCssAndCx();
 
-            setIsLoginButtonDisabled(true);
+    const [isLoginButtonDisabled, setIsLoginButtonDisabled] = useState(false);
 
-            const formElement = e.target as HTMLFormElement;
+    const onSubmit = useConstCallback<FormEventHandler<HTMLFormElement>>(e => {
+        e.preventDefault();
 
-            //NOTE: Even if we login with email Keycloak expect username and password in
-            //the POST request.
-            formElement.querySelector("input[name='email']")?.setAttribute("name", "username");
+        setIsLoginButtonDisabled(true);
 
-            formElement.submit();
-        });
+        const formElement = e.target as HTMLFormElement;
 
-        return (
-            <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
-                displayInfo={social.displayInfo}
-                displayWide={realm.password && social.providers !== undefined}
-                headerNode={msg("doLogIn")}
-                formNode={
-                    <div id="kc-form" className={cx(realm.password && social.providers !== undefined && props.kcContentWrapperClass)}>
-                        <div
-                            id="kc-form-wrapper"
-                            className={cx(
-                                realm.password && social.providers && [props.kcFormSocialAccountContentClass, props.kcFormSocialAccountClass]
-                            )}
-                        >
-                            {realm.password && (
-                                <form id="kc-form-login" onSubmit={onSubmit} action={url.loginAction} method="post">
-                                    <div className={cx(props.kcFormGroupClass)}>
-                                        {(() => {
-                                            const label = !realm.loginWithEmailAllowed
-                                                ? "username"
-                                                : realm.registrationEmailAsUsername
-                                                ? "email"
-                                                : "usernameOrEmail";
+        //NOTE: Even if we login with email Keycloak expect username and password in
+        //the POST request.
+        formElement.querySelector("input[name='email']")?.setAttribute("name", "username");
 
-                                            const autoCompleteHelper: typeof label = label === "usernameOrEmail" ? "username" : label;
+        formElement.submit();
+    });
 
-                                            return (
-                                                <>
-                                                    <label htmlFor={autoCompleteHelper} className={cx(props.kcLabelClass)}>
-                                                        {msg(label)}
-                                                    </label>
+    return (
+        <Template
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
+            displayInfo={social.displayInfo}
+            displayWide={realm.password && social.providers !== undefined}
+            headerNode={msg("doLogIn")}
+            formNode={
+                <div id="kc-form" className={cx(realm.password && social.providers !== undefined && kcProps.kcContentWrapperClass)}>
+                    <div
+                        id="kc-form-wrapper"
+                        className={cx(
+                            realm.password && social.providers && [kcProps.kcFormSocialAccountContentClass, kcProps.kcFormSocialAccountClass]
+                        )}
+                    >
+                        {realm.password && (
+                            <form id="kc-form-login" onSubmit={onSubmit} action={url.loginAction} method="post">
+                                <div className={cx(kcProps.kcFormGroupClass)}>
+                                    {(() => {
+                                        const label = !realm.loginWithEmailAllowed
+                                            ? "username"
+                                            : realm.registrationEmailAsUsername
+                                            ? "email"
+                                            : "usernameOrEmail";
+
+                                        const autoCompleteHelper: typeof label = label === "usernameOrEmail" ? "username" : label;
+
+                                        return (
+                                            <>
+                                                <label htmlFor={autoCompleteHelper} className={cx(kcProps.kcLabelClass)}>
+                                                    {msg(label)}
+                                                </label>
+                                                <input
+                                                    tabIndex={1}
+                                                    id={autoCompleteHelper}
+                                                    className={cx(kcProps.kcInputClass)}
+                                                    //NOTE: This is used by Google Chrome auto fill so we use it to tell
+                                                    //the browser how to pre fill the form but before submit we put it back
+                                                    //to username because it is what keycloak expects.
+                                                    name={autoCompleteHelper}
+                                                    defaultValue={login.username ?? ""}
+                                                    type="text"
+                                                    {...(usernameEditDisabled
+                                                        ? { "disabled": true }
+                                                        : {
+                                                              "autoFocus": true,
+                                                              "autoComplete": "off"
+                                                          })}
+                                                />
+                                            </>
+                                        );
+                                    })()}
+                                </div>
+                                <div className={cx(kcProps.kcFormGroupClass)}>
+                                    <label htmlFor="password" className={cx(kcProps.kcLabelClass)}>
+                                        {msg("password")}
+                                    </label>
+                                    <input
+                                        tabIndex={2}
+                                        id="password"
+                                        className={cx(kcProps.kcInputClass)}
+                                        name="password"
+                                        type="password"
+                                        autoComplete="off"
+                                    />
+                                </div>
+                                <div className={cx(kcProps.kcFormGroupClass, kcProps.kcFormSettingClass)}>
+                                    <div id="kc-form-options">
+                                        {realm.rememberMe && !usernameEditDisabled && (
+                                            <div className="checkbox">
+                                                <label>
                                                     <input
-                                                        tabIndex={1}
-                                                        id={autoCompleteHelper}
-                                                        className={cx(props.kcInputClass)}
-                                                        //NOTE: This is used by Google Chrome auto fill so we use it to tell
-                                                        //the browser how to pre fill the form but before submit we put it back
-                                                        //to username because it is what keycloak expects.
-                                                        name={autoCompleteHelper}
-                                                        defaultValue={login.username ?? ""}
-                                                        type="text"
-                                                        {...(usernameEditDisabled
-                                                            ? { "disabled": true }
-                                                            : {
-                                                                  "autoFocus": true,
-                                                                  "autoComplete": "off"
-                                                              })}
+                                                        tabIndex={3}
+                                                        id="rememberMe"
+                                                        name="rememberMe"
+                                                        type="checkbox"
+                                                        {...(login.rememberMe
+                                                            ? {
+                                                                  "checked": true
+                                                              }
+                                                            : {})}
                                                     />
-                                                </>
-                                            );
-                                        })()}
+                                                    {msg("rememberMe")}
+                                                </label>
+                                            </div>
+                                        )}
                                     </div>
-                                    <div className={cx(props.kcFormGroupClass)}>
-                                        <label htmlFor="password" className={cx(props.kcLabelClass)}>
-                                            {msg("password")}
-                                        </label>
-                                        <input
-                                            tabIndex={2}
-                                            id="password"
-                                            className={cx(props.kcInputClass)}
-                                            name="password"
-                                            type="password"
-                                            autoComplete="off"
-                                        />
+                                    <div className={cx(kcProps.kcFormOptionsWrapperClass)}>
+                                        {realm.resetPasswordAllowed && (
+                                            <span>
+                                                <a tabIndex={5} href={url.loginResetCredentialsUrl}>
+                                                    {msg("doForgotPassword")}
+                                                </a>
+                                            </span>
+                                        )}
                                     </div>
-                                    <div className={cx(props.kcFormGroupClass, props.kcFormSettingClass)}>
-                                        <div id="kc-form-options">
-                                            {realm.rememberMe && !usernameEditDisabled && (
-                                                <div className="checkbox">
-                                                    <label>
-                                                        <input
-                                                            tabIndex={3}
-                                                            id="rememberMe"
-                                                            name="rememberMe"
-                                                            type="checkbox"
-                                                            {...(login.rememberMe
-                                                                ? {
-                                                                      "checked": true
-                                                                  }
-                                                                : {})}
-                                                        />
-                                                        {msg("rememberMe")}
-                                                    </label>
-                                                </div>
-                                            )}
-                                        </div>
-                                        <div className={cx(props.kcFormOptionsWrapperClass)}>
-                                            {realm.resetPasswordAllowed && (
-                                                <span>
-                                                    <a tabIndex={5} href={url.loginResetCredentialsUrl}>
-                                                        {msg("doForgotPassword")}
-                                                    </a>
-                                                </span>
-                                            )}
-                                        </div>
-                                    </div>
-                                    <div id="kc-form-buttons" className={cx(props.kcFormGroupClass)}>
-                                        <input
-                                            type="hidden"
-                                            id="id-hidden-input"
-                                            name="credentialId"
-                                            {...(auth?.selectedCredential !== undefined
-                                                ? {
-                                                      "value": auth.selectedCredential
-                                                  }
-                                                : {})}
-                                        />
-                                        <input
-                                            tabIndex={4}
-                                            className={cx(
-                                                props.kcButtonClass,
-                                                props.kcButtonPrimaryClass,
-                                                props.kcButtonBlockClass,
-                                                props.kcButtonLargeClass
-                                            )}
-                                            name="login"
-                                            id="kc-login"
-                                            type="submit"
-                                            value={msgStr("doLogIn")}
-                                            disabled={isLoginButtonDisabled}
-                                        />
-                                    </div>
-                                </form>
-                            )}
-                        </div>
-                        {realm.password && social.providers !== undefined && (
-                            <div id="kc-social-providers" className={cx(props.kcFormSocialAccountContentClass, props.kcFormSocialAccountClass)}>
-                                <ul
-                                    className={cx(
-                                        props.kcFormSocialAccountListClass,
-                                        social.providers.length > 4 && props.kcFormSocialAccountDoubleListClass
-                                    )}
-                                >
-                                    {social.providers.map(p => (
-                                        <li key={p.providerId} className={cx(props.kcFormSocialAccountListLinkClass)}>
-                                            <a href={p.loginUrl} id={`zocial-${p.alias}`} className={cx("zocial", p.providerId)}>
-                                                <span>{p.displayName}</span>
-                                            </a>
-                                        </li>
-                                    ))}
-                                </ul>
-                            </div>
+                                </div>
+                                <div id="kc-form-buttons" className={cx(kcProps.kcFormGroupClass)}>
+                                    <input
+                                        type="hidden"
+                                        id="id-hidden-input"
+                                        name="credentialId"
+                                        {...(auth?.selectedCredential !== undefined
+                                            ? {
+                                                  "value": auth.selectedCredential
+                                              }
+                                            : {})}
+                                    />
+                                    <input
+                                        tabIndex={4}
+                                        className={cx(
+                                            kcProps.kcButtonClass,
+                                            kcProps.kcButtonPrimaryClass,
+                                            kcProps.kcButtonBlockClass,
+                                            kcProps.kcButtonLargeClass
+                                        )}
+                                        name="login"
+                                        id="kc-login"
+                                        type="submit"
+                                        value={msgStr("doLogIn")}
+                                        disabled={isLoginButtonDisabled}
+                                    />
+                                </div>
+                            </form>
                         )}
                     </div>
-                }
-                infoNode={
-                    realm.password &&
-                    realm.registrationAllowed &&
-                    !registrationDisabled && (
-                        <div id="kc-registration">
-                            <span>
-                                {msg("noAccount")}
-                                <a tabIndex={6} href={url.registrationUrl}>
-                                    {msg("doRegister")}
-                                </a>
-                            </span>
+                    {realm.password && social.providers !== undefined && (
+                        <div id="kc-social-providers" className={cx(kcProps.kcFormSocialAccountContentClass, kcProps.kcFormSocialAccountClass)}>
+                            <ul
+                                className={cx(
+                                    kcProps.kcFormSocialAccountListClass,
+                                    social.providers.length > 4 && kcProps.kcFormSocialAccountDoubleListClass
+                                )}
+                            >
+                                {social.providers.map(p => (
+                                    <li key={p.providerId} className={cx(kcProps.kcFormSocialAccountListLinkClass)}>
+                                        <a href={p.loginUrl} id={`zocial-${p.alias}`} className={cx("zocial", p.providerId)}>
+                                            <span>{p.displayName}</span>
+                                        </a>
+                                    </li>
+                                ))}
+                            </ul>
                         </div>
-                    )
-                }
-            />
-        );
-    }
-);
+                    )}
+                </div>
+            }
+            infoNode={
+                realm.password &&
+                realm.registrationAllowed &&
+                !registrationDisabled && (
+                    <div id="kc-registration">
+                        <span>
+                            {msg("noAccount")}
+                            <a tabIndex={6} href={url.registrationUrl}>
+                                {msg("doRegister")}
+                            </a>
+                        </span>
+                    </div>
+                )
+            }
+        />
+    );
+});
 
 export default Login;
diff --git a/src/lib/components/LoginConfigTotp.tsx b/src/lib/components/LoginConfigTotp.tsx
index 02e6ffad..d10a7f43 100644
--- a/src/lib/components/LoginConfigTotp.tsx
+++ b/src/lib/components/LoginConfigTotp.tsx
@@ -1,192 +1,195 @@
 import React, { memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 
-const LoginConfigTotp = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.LoginConfigTotp; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
-        const { url, isAppInitiatedAction, totp, mode, messagesPerField } = kcContext;
+export type LoginConfigTotpProps = KcProps & {
+    kcContext: KcContextBase.LoginConfigTotp;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
 
-        const { cx } = useCssAndCx();
+const LoginConfigTotp = memo((props: LoginConfigTotpProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
 
-        const { msg, msgStr } = i18n;
+    const { url, isAppInitiatedAction, totp, mode, messagesPerField } = kcContext;
 
-        const algToKeyUriAlg: Record<KcContextBase.LoginConfigTotp["totp"]["policy"]["algorithm"], string> = {
-            HmacSHA1: "SHA1",
-            HmacSHA256: "SHA256",
-            HmacSHA512: "SHA512"
-        };
+    const { cx } = useCssAndCx();
 
-        return (
-            <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
-                headerNode={msg("loginTotpTitle")}
-                formNode={
-                    <>
-                        <ol id="kc-totp-settings">
-                            <li>
-                                <p>{msg("loginTotpStep1")}</p>
+    const { msg, msgStr } = i18n;
 
-                                <ul id="kc-totp-supported-apps">
-                                    {totp.policy.supportedApplications.map(app => (
-                                        <li>{app}</li>
-                                    ))}
-                                </ul>
-                            </li>
+    const algToKeyUriAlg: Record<KcContextBase.LoginConfigTotp["totp"]["policy"]["algorithm"], string> = {
+        "HmacSHA1": "SHA1",
+        "HmacSHA256": "SHA256",
+        "HmacSHA512": "SHA512"
+    };
 
-                            {mode && mode == "manual" ? (
-                                <>
-                                    <li>
-                                        <p>{msg("loginTotpManualStep2")}</p>
-                                        <p>
-                                            <span id="kc-totp-secret-key">{totp.totpSecretEncoded}</span>
-                                        </p>
-                                        <p>
-                                            <a href={totp.qrUrl} id="mode-barcode">
-                                                {msg("loginTotpScanBarcode")}
-                                            </a>
-                                        </p>
-                                    </li>
-                                    <li>
-                                        <p>{msg("loginTotpManualStep3")}</p>
-                                        <p>
-                                            <ul>
-                                                <li id="kc-totp-type">
-                                                    {msg("loginTotpType")}: {msg(`loginTotp.${totp.policy.type}`)}
-                                                </li>
-                                                <li id="kc-totp-algorithm">
-                                                    {msg("loginTotpAlgorithm")}: {algToKeyUriAlg?.[totp.policy.algorithm] ?? totp.policy.algorithm}
-                                                </li>
-                                                <li id="kc-totp-digits">
-                                                    {msg("loginTotpDigits")}: {totp.policy.digits}
-                                                </li>
-                                                {totp.policy.type === "totp" ? (
-                                                    <li id="kc-totp-period">
-                                                        {msg("loginTotpInterval")}: {totp.policy.period}
-                                                    </li>
-                                                ) : (
-                                                    <li id="kc-totp-counter">
-                                                        {msg("loginTotpCounter")}: {totp.policy.initialCounter}
-                                                    </li>
-                                                )}
-                                            </ul>
-                                        </p>
-                                    </li>
-                                </>
-                            ) : (
+    return (
+        <Template
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
+            headerNode={msg("loginTotpTitle")}
+            formNode={
+                <>
+                    <ol id="kc-totp-settings">
+                        <li>
+                            <p>{msg("loginTotpStep1")}</p>
+
+                            <ul id="kc-totp-supported-apps">
+                                {totp.policy.supportedApplications.map(app => (
+                                    <li>{app}</li>
+                                ))}
+                            </ul>
+                        </li>
+
+                        {mode && mode == "manual" ? (
+                            <>
                                 <li>
-                                    <p>{msg("loginTotpStep2")}</p>
-                                    <img id="kc-totp-secret-qr-code" src={`data:image/png;base64, ${totp.totpSecretQrCode}`} alt="Figure: Barcode" />
-                                    <br />
+                                    <p>{msg("loginTotpManualStep2")}</p>
                                     <p>
-                                        <a href={totp.manualUrl} id="mode-manual">
-                                            {msg("loginTotpUnableToScan")}
+                                        <span id="kc-totp-secret-key">{totp.totpSecretEncoded}</span>
+                                    </p>
+                                    <p>
+                                        <a href={totp.qrUrl} id="mode-barcode">
+                                            {msg("loginTotpScanBarcode")}
                                         </a>
                                     </p>
                                 </li>
-                            )}
+                                <li>
+                                    <p>{msg("loginTotpManualStep3")}</p>
+                                    <p>
+                                        <ul>
+                                            <li id="kc-totp-type">
+                                                {msg("loginTotpType")}: {msg(`loginTotp.${totp.policy.type}`)}
+                                            </li>
+                                            <li id="kc-totp-algorithm">
+                                                {msg("loginTotpAlgorithm")}: {algToKeyUriAlg?.[totp.policy.algorithm] ?? totp.policy.algorithm}
+                                            </li>
+                                            <li id="kc-totp-digits">
+                                                {msg("loginTotpDigits")}: {totp.policy.digits}
+                                            </li>
+                                            {totp.policy.type === "totp" ? (
+                                                <li id="kc-totp-period">
+                                                    {msg("loginTotpInterval")}: {totp.policy.period}
+                                                </li>
+                                            ) : (
+                                                <li id="kc-totp-counter">
+                                                    {msg("loginTotpCounter")}: {totp.policy.initialCounter}
+                                                </li>
+                                            )}
+                                        </ul>
+                                    </p>
+                                </li>
+                            </>
+                        ) : (
                             <li>
-                                <p>{msg("loginTotpStep3")}</p>
-                                <p>{msg("loginTotpStep3DeviceName")}</p>
+                                <p>{msg("loginTotpStep2")}</p>
+                                <img id="kc-totp-secret-qr-code" src={`data:image/png;base64, ${totp.totpSecretQrCode}`} alt="Figure: Barcode" />
+                                <br />
+                                <p>
+                                    <a href={totp.manualUrl} id="mode-manual">
+                                        {msg("loginTotpUnableToScan")}
+                                    </a>
+                                </p>
                             </li>
-                        </ol>
+                        )}
+                        <li>
+                            <p>{msg("loginTotpStep3")}</p>
+                            <p>{msg("loginTotpStep3DeviceName")}</p>
+                        </li>
+                    </ol>
 
-                        <form action={url.loginAction} className={cx(props.kcFormClass)} id="kc-totp-settings-form" method="post">
-                            <div className={cx(props.kcFormGroupClass)}>
-                                <div className={cx(props.kcInputWrapperClass)}>
-                                    <label htmlFor="totp" className={cx(props.kcLabelClass)}>
-                                        {msg("authenticatorCode")}
-                                    </label>{" "}
-                                    <span className="required">*</span>
-                                </div>
-                                <div className={cx(props.kcInputWrapperClass)}>
-                                    <input
-                                        type="text"
-                                        id="totp"
-                                        name="totp"
-                                        autoComplete="off"
-                                        className={cx(props.kcInputClass)}
-                                        aria-invalid={messagesPerField.existsError("totp")}
-                                    />
-
-                                    {messagesPerField.existsError("totp") && (
-                                        <span id="input-error-otp-code" className={cx(props.kcInputErrorMessageClass)} aria-live="polite">
-                                            {messagesPerField.get("totp")}
-                                        </span>
-                                    )}
-                                </div>
-                                <input type="hidden" id="totpSecret" name="totpSecret" value={totp.totpSecret} />
-                                {mode && <input type="hidden" id="mode" value={mode} />}
+                    <form action={url.loginAction} className={cx(kcProps.kcFormClass)} id="kc-totp-settings-form" method="post">
+                        <div className={cx(kcProps.kcFormGroupClass)}>
+                            <div className={cx(kcProps.kcInputWrapperClass)}>
+                                <label htmlFor="totp" className={cx(kcProps.kcLabelClass)}>
+                                    {msg("authenticatorCode")}
+                                </label>{" "}
+                                <span className="required">*</span>
                             </div>
+                            <div className={cx(kcProps.kcInputWrapperClass)}>
+                                <input
+                                    type="text"
+                                    id="totp"
+                                    name="totp"
+                                    autoComplete="off"
+                                    className={cx(kcProps.kcInputClass)}
+                                    aria-invalid={messagesPerField.existsError("totp")}
+                                />
 
-                            <div className={cx(props.kcFormGroupClass)}>
-                                <div className={cx(props.kcInputWrapperClass)}>
-                                    <label htmlFor="userLabel" className={cx(props.kcLabelClass)}>
-                                        {msg("loginTotpDeviceName")}
-                                    </label>{" "}
-                                    {totp.otpCredentials.length >= 1 && <span className="required">*</span>}
-                                </div>
-                                <div className={cx(props.kcInputWrapperClass)}>
-                                    <input
-                                        type="text"
-                                        id="userLabel"
-                                        name="userLabel"
-                                        autoComplete="off"
-                                        className={cx(props.kcInputClass)}
-                                        aria-invalid={messagesPerField.existsError("userLabel")}
-                                    />
-                                    {messagesPerField.existsError("userLabel") && (
-                                        <span id="input-error-otp-label" className={cx(props.kcInputErrorMessageClass)} aria-live="polite">
-                                            {messagesPerField.get("userLabel")}
-                                        </span>
-                                    )}
-                                </div>
+                                {messagesPerField.existsError("totp") && (
+                                    <span id="input-error-otp-code" className={cx(kcProps.kcInputErrorMessageClass)} aria-live="polite">
+                                        {messagesPerField.get("totp")}
+                                    </span>
+                                )}
                             </div>
+                            <input type="hidden" id="totpSecret" name="totpSecret" value={totp.totpSecret} />
+                            {mode && <input type="hidden" id="mode" value={mode} />}
+                        </div>
 
-                            {isAppInitiatedAction ? (
-                                <>
-                                    <input
-                                        type="submit"
-                                        className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonLargeClass)}
-                                        id="saveTOTPBtn"
-                                        value={msgStr("doSubmit")}
-                                    />
-                                    <button
-                                        type="submit"
-                                        className={cx(
-                                            props.kcButtonClass,
-                                            props.kcButtonDefaultClass,
-                                            props.kcButtonLargeClass,
-                                            props.kcButtonLargeClass
-                                        )}
-                                        id="cancelTOTPBtn"
-                                        name="cancel-aia"
-                                        value="true"
-                                    >
-                                        ${msg("doCancel")}
-                                    </button>
-                                </>
-                            ) : (
+                        <div className={cx(kcProps.kcFormGroupClass)}>
+                            <div className={cx(kcProps.kcInputWrapperClass)}>
+                                <label htmlFor="userLabel" className={cx(kcProps.kcLabelClass)}>
+                                    {msg("loginTotpDeviceName")}
+                                </label>{" "}
+                                {totp.otpCredentials.length >= 1 && <span className="required">*</span>}
+                            </div>
+                            <div className={cx(kcProps.kcInputWrapperClass)}>
+                                <input
+                                    type="text"
+                                    id="userLabel"
+                                    name="userLabel"
+                                    autoComplete="off"
+                                    className={cx(kcProps.kcInputClass)}
+                                    aria-invalid={messagesPerField.existsError("userLabel")}
+                                />
+                                {messagesPerField.existsError("userLabel") && (
+                                    <span id="input-error-otp-label" className={cx(kcProps.kcInputErrorMessageClass)} aria-live="polite">
+                                        {messagesPerField.get("userLabel")}
+                                    </span>
+                                )}
+                            </div>
+                        </div>
+
+                        {isAppInitiatedAction ? (
+                            <>
                                 <input
                                     type="submit"
-                                    className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonLargeClass)}
+                                    className={cx(kcProps.kcButtonClass, kcProps.kcButtonPrimaryClass, kcProps.kcButtonLargeClass)}
                                     id="saveTOTPBtn"
                                     value={msgStr("doSubmit")}
                                 />
-                            )}
-                        </form>
-                    </>
-                }
-            />
-        );
-    }
-);
+                                <button
+                                    type="submit"
+                                    className={cx(
+                                        kcProps.kcButtonClass,
+                                        kcProps.kcButtonDefaultClass,
+                                        kcProps.kcButtonLargeClass,
+                                        kcProps.kcButtonLargeClass
+                                    )}
+                                    id="cancelTOTPBtn"
+                                    name="cancel-aia"
+                                    value="true"
+                                >
+                                    ${msg("doCancel")}
+                                </button>
+                            </>
+                        ) : (
+                            <input
+                                type="submit"
+                                className={cx(kcProps.kcButtonClass, kcProps.kcButtonPrimaryClass, kcProps.kcButtonLargeClass)}
+                                id="saveTOTPBtn"
+                                value={msgStr("doSubmit")}
+                            />
+                        )}
+                    </form>
+                </>
+            }
+        />
+    );
+});
 
 export default LoginConfigTotp;
diff --git a/src/lib/components/LoginIdpLinkConfirm.tsx b/src/lib/components/LoginIdpLinkConfirm.tsx
index 192ae341..b0903c36 100644
--- a/src/lib/components/LoginIdpLinkConfirm.tsx
+++ b/src/lib/components/LoginIdpLinkConfirm.tsx
@@ -1,54 +1,67 @@
 import React, { memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 
-const LoginIdpLinkConfirm = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.LoginIdpLinkConfirm; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
-        const { url, idpAlias } = kcContext;
+export type LoginIdpLinkConfirmProps = KcProps & {
+    kcContext: KcContextBase.LoginIdpLinkConfirm;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
 
-        const { msg } = i18n;
+const LoginIdpLinkConfirm = memo((props: LoginIdpLinkConfirmProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
 
-        const { cx } = useCssAndCx();
+    const { url, idpAlias } = kcContext;
 
-        return (
-            <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
-                headerNode={msg("confirmLinkIdpTitle")}
-                formNode={
-                    <form id="kc-register-form" action={url.loginAction} method="post">
-                        <div className={cx(props.kcFormGroupClass)}>
-                            <button
-                                type="submit"
-                                className={cx(props.kcButtonClass, props.kcButtonDefaultClass, props.kcButtonBlockClass, props.kcButtonLargeClass)}
-                                name="submitAction"
-                                id="updateProfile"
-                                value="updateProfile"
-                            >
-                                {msg("confirmLinkIdpReviewProfile")}
-                            </button>
-                            <button
-                                type="submit"
-                                className={cx(props.kcButtonClass, props.kcButtonDefaultClass, props.kcButtonBlockClass, props.kcButtonLargeClass)}
-                                name="submitAction"
-                                id="linkAccount"
-                                value="linkAccount"
-                            >
-                                {msg("confirmLinkIdpContinue", idpAlias)}
-                            </button>
-                        </div>
-                    </form>
-                }
-            />
-        );
-    }
-);
+    const { msg } = i18n;
+
+    const { cx } = useCssAndCx();
+
+    return (
+        <Template
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
+            headerNode={msg("confirmLinkIdpTitle")}
+            formNode={
+                <form id="kc-register-form" action={url.loginAction} method="post">
+                    <div className={cx(kcProps.kcFormGroupClass)}>
+                        <button
+                            type="submit"
+                            className={cx(
+                                kcProps.kcButtonClass,
+                                kcProps.kcButtonDefaultClass,
+                                kcProps.kcButtonBlockClass,
+                                kcProps.kcButtonLargeClass
+                            )}
+                            name="submitAction"
+                            id="updateProfile"
+                            value="updateProfile"
+                        >
+                            {msg("confirmLinkIdpReviewProfile")}
+                        </button>
+                        <button
+                            type="submit"
+                            className={cx(
+                                kcProps.kcButtonClass,
+                                kcProps.kcButtonDefaultClass,
+                                kcProps.kcButtonBlockClass,
+                                kcProps.kcButtonLargeClass
+                            )}
+                            name="submitAction"
+                            id="linkAccount"
+                            value="linkAccount"
+                        >
+                            {msg("confirmLinkIdpContinue", idpAlias)}
+                        </button>
+                    </div>
+                </form>
+            }
+        />
+    );
+});
 
 export default LoginIdpLinkConfirm;
diff --git a/src/lib/components/LoginIdpLinkEmail.tsx b/src/lib/components/LoginIdpLinkEmail.tsx
index 3277e1b6..66396a19 100644
--- a/src/lib/components/LoginIdpLinkEmail.tsx
+++ b/src/lib/components/LoginIdpLinkEmail.tsx
@@ -1,40 +1,43 @@
 import React, { memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import type { I18n } from "../i18n";
 
-const LoginIdpLinkEmail = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.LoginIdpLinkEmail; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
-        const { url, realm, brokerContext, idpAlias } = kcContext;
+export type LoginIdpLinkEmailProps = KcProps & {
+    kcContext: KcContextBase.LoginIdpLinkEmail;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
 
-        const { msg } = i18n;
+const LoginIdpLinkEmail = memo((props: LoginIdpLinkEmailProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
 
-        return (
-            <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
-                headerNode={msg("emailLinkIdpTitle", idpAlias)}
-                formNode={
-                    <>
-                        <p id="instruction1" className="instruction">
-                            {msg("emailLinkIdp1", idpAlias, brokerContext.username, realm.displayName)}
-                        </p>
-                        <p id="instruction2" className="instruction">
-                            {msg("emailLinkIdp2")} <a href={url.loginAction}>{msg("doClickHere")}</a> {msg("emailLinkIdp3")}
-                        </p>
-                        <p id="instruction3" className="instruction">
-                            {msg("emailLinkIdp4")} <a href={url.loginAction}>{msg("doClickHere")}</a> {msg("emailLinkIdp5")}
-                        </p>
-                    </>
-                }
-            />
-        );
-    }
-);
+    const { url, realm, brokerContext, idpAlias } = kcContext;
+
+    const { msg } = i18n;
+
+    return (
+        <Template
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
+            headerNode={msg("emailLinkIdpTitle", idpAlias)}
+            formNode={
+                <>
+                    <p id="instruction1" className="instruction">
+                        {msg("emailLinkIdp1", idpAlias, brokerContext.username, realm.displayName)}
+                    </p>
+                    <p id="instruction2" className="instruction">
+                        {msg("emailLinkIdp2")} <a href={url.loginAction}>{msg("doClickHere")}</a> {msg("emailLinkIdp3")}
+                    </p>
+                    <p id="instruction3" className="instruction">
+                        {msg("emailLinkIdp4")} <a href={url.loginAction}>{msg("doClickHere")}</a> {msg("emailLinkIdp5")}
+                    </p>
+                </>
+            }
+        />
+    );
+});
 
 export default LoginIdpLinkEmail;
diff --git a/src/lib/components/LoginOtp.tsx b/src/lib/components/LoginOtp.tsx
index 1a605b71..e0df7862 100644
--- a/src/lib/components/LoginOtp.tsx
+++ b/src/lib/components/LoginOtp.tsx
@@ -1,5 +1,6 @@
 import React, { useEffect, memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { headInsert } from "../tools/headInsert";
@@ -7,95 +8,97 @@ import { pathJoin } from "../../bin/tools/pathJoin";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 
-const LoginOtp = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.LoginOtp; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
-        const { otpLogin, url } = kcContext;
+export type LoginOtpProps = KcProps & {
+    kcContext: KcContextBase.LoginOtp;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
 
-        const { cx } = useCssAndCx();
+const LoginOtp = memo((props: LoginOtpProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
 
-        const { msg, msgStr } = i18n;
+    const { otpLogin, url } = kcContext;
 
-        useEffect(() => {
-            let isCleanedUp = false;
+    const { cx } = useCssAndCx();
 
-            headInsert({
-                "type": "javascript",
-                "src": pathJoin(kcContext.url.resourcesCommonPath, "node_modules/jquery/dist/jquery.min.js")
-            }).then(() => {
-                if (isCleanedUp) return;
+    const { msg, msgStr } = i18n;
 
-                evaluateInlineScript();
-            });
+    useEffect(() => {
+        let isCleanedUp = false;
 
-            return () => {
-                isCleanedUp = true;
-            };
-        }, []);
+        headInsert({
+            "type": "javascript",
+            "src": pathJoin(kcContext.url.resourcesCommonPath, "node_modules/jquery/dist/jquery.min.js")
+        }).then(() => {
+            if (isCleanedUp) return;
 
-        return (
-            <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
-                headerNode={msg("doLogIn")}
-                formNode={
-                    <form id="kc-otp-login-form" className={cx(props.kcFormClass)} action={url.loginAction} method="post">
-                        {otpLogin.userOtpCredentials.length > 1 && (
-                            <div className={cx(props.kcFormGroupClass)}>
-                                <div className={cx(props.kcInputWrapperClass)}>
-                                    {otpLogin.userOtpCredentials.map(otpCredential => (
-                                        <div key={otpCredential.id} className={cx(props.kcSelectOTPListClass)}>
-                                            <input type="hidden" value="${otpCredential.id}" />
-                                            <div className={cx(props.kcSelectOTPListItemClass)}>
-                                                <span className={cx(props.kcAuthenticatorOtpCircleClass)} />
-                                                <h2 className={cx(props.kcSelectOTPItemHeadingClass)}>{otpCredential.userLabel}</h2>
-                                            </div>
+            evaluateInlineScript();
+        });
+
+        return () => {
+            isCleanedUp = true;
+        };
+    }, []);
+
+    return (
+        <Template
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
+            headerNode={msg("doLogIn")}
+            formNode={
+                <form id="kc-otp-login-form" className={cx(kcProps.kcFormClass)} action={url.loginAction} method="post">
+                    {otpLogin.userOtpCredentials.length > 1 && (
+                        <div className={cx(kcProps.kcFormGroupClass)}>
+                            <div className={cx(kcProps.kcInputWrapperClass)}>
+                                {otpLogin.userOtpCredentials.map(otpCredential => (
+                                    <div key={otpCredential.id} className={cx(kcProps.kcSelectOTPListClass)}>
+                                        <input type="hidden" value="${otpCredential.id}" />
+                                        <div className={cx(kcProps.kcSelectOTPListItemClass)}>
+                                            <span className={cx(kcProps.kcAuthenticatorOtpCircleClass)} />
+                                            <h2 className={cx(kcProps.kcSelectOTPItemHeadingClass)}>{otpCredential.userLabel}</h2>
                                         </div>
-                                    ))}
-                                </div>
-                            </div>
-                        )}
-                        <div className={cx(props.kcFormGroupClass)}>
-                            <div className={cx(props.kcLabelWrapperClass)}>
-                                <label htmlFor="otp" className={cx(props.kcLabelClass)}>
-                                    {msg("loginOtpOneTime")}
-                                </label>
-                            </div>
-
-                            <div className={cx(props.kcInputWrapperClass)}>
-                                <input id="otp" name="otp" autoComplete="off" type="text" className={cx(props.kcInputClass)} autoFocus />
+                                    </div>
+                                ))}
                             </div>
                         </div>
-
-                        <div className={cx(props.kcFormGroupClass)}>
-                            <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
-                                <div className={cx(props.kcFormOptionsWrapperClass)} />
-                            </div>
-
-                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
-                                <input
-                                    className={cx(
-                                        props.kcButtonClass,
-                                        props.kcButtonPrimaryClass,
-                                        props.kcButtonBlockClass,
-                                        props.kcButtonLargeClass
-                                    )}
-                                    name="login"
-                                    id="kc-login"
-                                    type="submit"
-                                    value={msgStr("doLogIn")}
-                                />
-                            </div>
+                    )}
+                    <div className={cx(kcProps.kcFormGroupClass)}>
+                        <div className={cx(kcProps.kcLabelWrapperClass)}>
+                            <label htmlFor="otp" className={cx(kcProps.kcLabelClass)}>
+                                {msg("loginOtpOneTime")}
+                            </label>
                         </div>
-                    </form>
-                }
-            />
-        );
-    }
-);
+
+                        <div className={cx(kcProps.kcInputWrapperClass)}>
+                            <input id="otp" name="otp" autoComplete="off" type="text" className={cx(kcProps.kcInputClass)} autoFocus />
+                        </div>
+                    </div>
+
+                    <div className={cx(kcProps.kcFormGroupClass)}>
+                        <div id="kc-form-options" className={cx(kcProps.kcFormOptionsClass)}>
+                            <div className={cx(kcProps.kcFormOptionsWrapperClass)} />
+                        </div>
+
+                        <div id="kc-form-buttons" className={cx(kcProps.kcFormButtonsClass)}>
+                            <input
+                                className={cx(
+                                    kcProps.kcButtonClass,
+                                    kcProps.kcButtonPrimaryClass,
+                                    kcProps.kcButtonBlockClass,
+                                    kcProps.kcButtonLargeClass
+                                )}
+                                name="login"
+                                id="kc-login"
+                                type="submit"
+                                value={msgStr("doLogIn")}
+                            />
+                        </div>
+                    </div>
+                </form>
+            }
+        />
+    );
+});
 
 declare const $: any;
 
diff --git a/src/lib/components/LoginPageExpired.tsx b/src/lib/components/LoginPageExpired.tsx
index 9ecfb321..3669712b 100644
--- a/src/lib/components/LoginPageExpired.tsx
+++ b/src/lib/components/LoginPageExpired.tsx
@@ -1,44 +1,47 @@
 import React, { memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import type { I18n } from "../i18n";
 
-const LoginPageExpired = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.LoginPageExpired; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
-        const { url } = kcContext;
+export type LoginPageExpired = KcProps & {
+    kcContext: KcContextBase.LoginPageExpired;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
 
-        const { msg } = i18n;
+const LoginPageExpired = memo((props: LoginPageExpired) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
 
-        return (
-            <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
-                displayMessage={false}
-                headerNode={msg("pageExpiredTitle")}
-                formNode={
-                    <>
-                        <p id="instruction1" className="instruction">
-                            {msg("pageExpiredMsg1")}
-                            <a id="loginRestartLink" href={url.loginRestartFlowUrl}>
-                                {msg("doClickHere")}
-                            </a>{" "}
-                            .<br />
-                            {msg("pageExpiredMsg2")}{" "}
-                            <a id="loginContinueLink" href={url.loginAction}>
-                                {msg("doClickHere")}
-                            </a>{" "}
-                            .
-                        </p>
-                    </>
-                }
-            />
-        );
-    }
-);
+    const { url } = kcContext;
+
+    const { msg } = i18n;
+
+    return (
+        <Template
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
+            displayMessage={false}
+            headerNode={msg("pageExpiredTitle")}
+            formNode={
+                <>
+                    <p id="instruction1" className="instruction">
+                        {msg("pageExpiredMsg1")}
+                        <a id="loginRestartLink" href={url.loginRestartFlowUrl}>
+                            {msg("doClickHere")}
+                        </a>{" "}
+                        .<br />
+                        {msg("pageExpiredMsg2")}{" "}
+                        <a id="loginContinueLink" href={url.loginAction}>
+                            {msg("doClickHere")}
+                        </a>{" "}
+                        .
+                    </p>
+                </>
+            }
+        />
+    );
+});
 
 export default LoginPageExpired;
diff --git a/src/lib/components/LoginPassword.tsx b/src/lib/components/LoginPassword.tsx
index 2b74cdf0..9a614c43 100644
--- a/src/lib/components/LoginPassword.tsx
+++ b/src/lib/components/LoginPassword.tsx
@@ -1,5 +1,6 @@
 import React, { useState, memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
@@ -7,90 +8,92 @@ import { useConstCallback } from "powerhooks/useConstCallback";
 import type { FormEventHandler } from "react";
 import type { I18n } from "../i18n";
 
-const LoginPassword = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.LoginPassword; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
-        const { realm, url, login } = kcContext;
+export type LoginPasswordProps = KcProps & {
+    kcContext: KcContextBase.LoginPassword;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
 
-        const { msg, msgStr } = i18n;
+const LoginPassword = memo((props: LoginPasswordProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
 
-        const { cx } = useCssAndCx();
+    const { realm, url, login } = kcContext;
 
-        const [isLoginButtonDisabled, setIsLoginButtonDisabled] = useState(false);
+    const { msg, msgStr } = i18n;
 
-        const onSubmit = useConstCallback<FormEventHandler<HTMLFormElement>>(e => {
-            e.preventDefault();
+    const { cx } = useCssAndCx();
 
-            setIsLoginButtonDisabled(true);
+    const [isLoginButtonDisabled, setIsLoginButtonDisabled] = useState(false);
 
-            const formElement = e.target as HTMLFormElement;
+    const onSubmit = useConstCallback<FormEventHandler<HTMLFormElement>>(e => {
+        e.preventDefault();
 
-            formElement.submit();
-        });
+        setIsLoginButtonDisabled(true);
 
-        return (
-            <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
-                headerNode={msg("doLogIn")}
-                formNode={
-                    <div id="kc-form">
-                        <div id="kc-form-wrapper">
-                            <form id="kc-form-login" onSubmit={onSubmit} action={url.loginAction} method="post">
-                                <div className={cx(props.kcFormGroupClass)}>
-                                    <hr />
-                                    <label htmlFor="password" className={cx(props.kcLabelClass)}>
-                                        {msg("password")}
-                                    </label>
-                                    <input
-                                        tabIndex={2}
-                                        id="password"
-                                        className={cx(props.kcInputClass)}
-                                        name="password"
-                                        type="password"
-                                        autoFocus={true}
-                                        autoComplete="on"
-                                        defaultValue={login.password ?? ""}
-                                    />
+        const formElement = e.target as HTMLFormElement;
+
+        formElement.submit();
+    });
+
+    return (
+        <Template
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
+            headerNode={msg("doLogIn")}
+            formNode={
+                <div id="kc-form">
+                    <div id="kc-form-wrapper">
+                        <form id="kc-form-login" onSubmit={onSubmit} action={url.loginAction} method="post">
+                            <div className={cx(kcProps.kcFormGroupClass)}>
+                                <hr />
+                                <label htmlFor="password" className={cx(kcProps.kcLabelClass)}>
+                                    {msg("password")}
+                                </label>
+                                <input
+                                    tabIndex={2}
+                                    id="password"
+                                    className={cx(kcProps.kcInputClass)}
+                                    name="password"
+                                    type="password"
+                                    autoFocus={true}
+                                    autoComplete="on"
+                                    defaultValue={login.password ?? ""}
+                                />
+                            </div>
+                            <div className={cx(kcProps.kcFormGroupClass, kcProps.kcFormSettingClass)}>
+                                <div id="kc-form-options" />
+                                <div className={cx(kcProps.kcFormOptionsWrapperClass)}>
+                                    {realm.resetPasswordAllowed && (
+                                        <span>
+                                            <a tabIndex={5} href={url.loginResetCredentialsUrl}>
+                                                {msg("doForgotPassword")}
+                                            </a>
+                                        </span>
+                                    )}
                                 </div>
-                                <div className={cx(props.kcFormGroupClass, props.kcFormSettingClass)}>
-                                    <div id="kc-form-options" />
-                                    <div className={cx(props.kcFormOptionsWrapperClass)}>
-                                        {realm.resetPasswordAllowed && (
-                                            <span>
-                                                <a tabIndex={5} href={url.loginResetCredentialsUrl}>
-                                                    {msg("doForgotPassword")}
-                                                </a>
-                                            </span>
-                                        )}
-                                    </div>
-                                </div>
-                                <div id="kc-form-buttons" className={cx(props.kcFormGroupClass)}>
-                                    <input
-                                        tabIndex={4}
-                                        className={cx(
-                                            props.kcButtonClass,
-                                            props.kcButtonPrimaryClass,
-                                            props.kcButtonBlockClass,
-                                            props.kcButtonLargeClass
-                                        )}
-                                        name="login"
-                                        id="kc-login"
-                                        type="submit"
-                                        value={msgStr("doLogIn")}
-                                        disabled={isLoginButtonDisabled}
-                                    />
-                                </div>
-                            </form>
-                        </div>
+                            </div>
+                            <div id="kc-form-buttons" className={cx(kcProps.kcFormGroupClass)}>
+                                <input
+                                    tabIndex={4}
+                                    className={cx(
+                                        kcProps.kcButtonClass,
+                                        kcProps.kcButtonPrimaryClass,
+                                        kcProps.kcButtonBlockClass,
+                                        kcProps.kcButtonLargeClass
+                                    )}
+                                    name="login"
+                                    id="kc-login"
+                                    type="submit"
+                                    value={msgStr("doLogIn")}
+                                    disabled={isLoginButtonDisabled}
+                                />
+                            </div>
+                        </form>
                     </div>
-                }
-            />
-        );
-    }
-);
+                </div>
+            }
+        />
+    );
+});
 
 export default LoginPassword;
diff --git a/src/lib/components/LoginResetPassword.tsx b/src/lib/components/LoginResetPassword.tsx
index 88002bec..2a4c0464 100644
--- a/src/lib/components/LoginResetPassword.tsx
+++ b/src/lib/components/LoginResetPassword.tsx
@@ -1,79 +1,82 @@
 import React, { memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 
-const LoginResetPassword = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.LoginResetPassword; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
-        const { url, realm, auth } = kcContext;
+export type LoginResetPasswordProps = KcProps & {
+    kcContext: KcContextBase.LoginResetPassword;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
 
-        const { msg, msgStr } = i18n;
+const LoginResetPassword = memo((props: LoginResetPasswordProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
 
-        const { cx } = useCssAndCx();
+    const { url, realm, auth } = kcContext;
 
-        return (
-            <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
-                displayMessage={false}
-                headerNode={msg("emailForgotTitle")}
-                formNode={
-                    <form id="kc-reset-password-form" className={cx(props.kcFormClass)} action={url.loginAction} method="post">
-                        <div className={cx(props.kcFormGroupClass)}>
-                            <div className={cx(props.kcLabelWrapperClass)}>
-                                <label htmlFor="username" className={cx(props.kcLabelClass)}>
-                                    {!realm.loginWithEmailAllowed
-                                        ? msg("username")
-                                        : !realm.registrationEmailAsUsername
-                                        ? msg("usernameOrEmail")
-                                        : msg("email")}
-                                </label>
-                            </div>
-                            <div className={cx(props.kcInputWrapperClass)}>
-                                <input
-                                    type="text"
-                                    id="username"
-                                    name="username"
-                                    className={cx(props.kcInputClass)}
-                                    autoFocus
-                                    defaultValue={auth !== undefined && auth.showUsername ? auth.attemptedUsername : undefined}
-                                />
+    const { msg, msgStr } = i18n;
+
+    const { cx } = useCssAndCx();
+
+    return (
+        <Template
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
+            displayMessage={false}
+            headerNode={msg("emailForgotTitle")}
+            formNode={
+                <form id="kc-reset-password-form" className={cx(kcProps.kcFormClass)} action={url.loginAction} method="post">
+                    <div className={cx(kcProps.kcFormGroupClass)}>
+                        <div className={cx(kcProps.kcLabelWrapperClass)}>
+                            <label htmlFor="username" className={cx(kcProps.kcLabelClass)}>
+                                {!realm.loginWithEmailAllowed
+                                    ? msg("username")
+                                    : !realm.registrationEmailAsUsername
+                                    ? msg("usernameOrEmail")
+                                    : msg("email")}
+                            </label>
+                        </div>
+                        <div className={cx(kcProps.kcInputWrapperClass)}>
+                            <input
+                                type="text"
+                                id="username"
+                                name="username"
+                                className={cx(kcProps.kcInputClass)}
+                                autoFocus
+                                defaultValue={auth !== undefined && auth.showUsername ? auth.attemptedUsername : undefined}
+                            />
+                        </div>
+                    </div>
+                    <div className={cx(kcProps.kcFormGroupClass, kcProps.kcFormSettingClass)}>
+                        <div id="kc-form-options" className={cx(kcProps.kcFormOptionsClass)}>
+                            <div className={cx(kcProps.kcFormOptionsWrapperClass)}>
+                                <span>
+                                    <a href={url.loginUrl}>{msg("backToLogin")}</a>
+                                </span>
                             </div>
                         </div>
-                        <div className={cx(props.kcFormGroupClass, props.kcFormSettingClass)}>
-                            <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
-                                <div className={cx(props.kcFormOptionsWrapperClass)}>
-                                    <span>
-                                        <a href={url.loginUrl}>{msg("backToLogin")}</a>
-                                    </span>
-                                </div>
-                            </div>
 
-                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
-                                <input
-                                    className={cx(
-                                        props.kcButtonClass,
-                                        props.kcButtonPrimaryClass,
-                                        props.kcButtonBlockClass,
-                                        props.kcButtonLargeClass
-                                    )}
-                                    type="submit"
-                                    value={msgStr("doSubmit")}
-                                />
-                            </div>
+                        <div id="kc-form-buttons" className={cx(kcProps.kcFormButtonsClass)}>
+                            <input
+                                className={cx(
+                                    kcProps.kcButtonClass,
+                                    kcProps.kcButtonPrimaryClass,
+                                    kcProps.kcButtonBlockClass,
+                                    kcProps.kcButtonLargeClass
+                                )}
+                                type="submit"
+                                value={msgStr("doSubmit")}
+                            />
                         </div>
-                    </form>
-                }
-                infoNode={msg("emailInstruction")}
-            />
-        );
-    }
-);
+                    </div>
+                </form>
+            }
+            infoNode={msg("emailInstruction")}
+        />
+    );
+});
 
 export default LoginResetPassword;
diff --git a/src/lib/components/LoginUpdatePassword.tsx b/src/lib/components/LoginUpdatePassword.tsx
index 155a4eed..de2ba3b9 100644
--- a/src/lib/components/LoginUpdatePassword.tsx
+++ b/src/lib/components/LoginUpdatePassword.tsx
@@ -1,125 +1,128 @@
 import React, { memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 
-const LoginUpdatePassword = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.LoginUpdatePassword; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
-        const { cx } = useCssAndCx();
+export type LoginUpdatePasswordProps = KcProps & {
+    kcContext: KcContextBase.LoginUpdatePassword;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
 
-        const { msg, msgStr } = i18n;
+const LoginUpdatePassword = memo((props: LoginUpdatePasswordProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
 
-        const { url, messagesPerField, isAppInitiatedAction, username } = kcContext;
+    const { cx } = useCssAndCx();
 
-        return (
-            <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
-                headerNode={msg("updatePasswordTitle")}
-                formNode={
-                    <form id="kc-passwd-update-form" className={cx(props.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" }} />
+    const { msg, msgStr } = i18n;
 
-                        <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("password", props.kcFormGroupErrorClass))}>
-                            <div className={cx(props.kcLabelWrapperClass)}>
-                                <label htmlFor="password-new" className={cx(props.kcLabelClass)}>
-                                    {msg("passwordNew")}
-                                </label>
-                            </div>
-                            <div className={cx(props.kcInputWrapperClass)}>
-                                <input
-                                    type="password"
-                                    id="password-new"
-                                    name="password-new"
-                                    autoFocus
-                                    autoComplete="new-password"
-                                    className={cx(props.kcInputClass)}
-                                />
-                            </div>
+    const { url, messagesPerField, isAppInitiatedAction, username } = kcContext;
+
+    return (
+        <Template
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
+            headerNode={msg("updatePasswordTitle")}
+            formNode={
+                <form id="kc-passwd-update-form" className={cx(kcProps.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={cx(kcProps.kcFormGroupClass, messagesPerField.printIfExists("password", kcProps.kcFormGroupErrorClass))}>
+                        <div className={cx(kcProps.kcLabelWrapperClass)}>
+                            <label htmlFor="password-new" className={cx(kcProps.kcLabelClass)}>
+                                {msg("passwordNew")}
+                            </label>
                         </div>
-
-                        <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("password-confirm", props.kcFormGroupErrorClass))}>
-                            <div className={cx(props.kcLabelWrapperClass)}>
-                                <label htmlFor="password-confirm" className={cx(props.kcLabelClass)}>
-                                    {msg("passwordConfirm")}
-                                </label>
-                            </div>
-                            <div className={cx(props.kcInputWrapperClass)}>
-                                <input
-                                    type="password"
-                                    id="password-confirm"
-                                    name="password-confirm"
-                                    autoComplete="new-password"
-                                    className={cx(props.kcInputClass)}
-                                />
-                            </div>
+                        <div className={cx(kcProps.kcInputWrapperClass)}>
+                            <input
+                                type="password"
+                                id="password-new"
+                                name="password-new"
+                                autoFocus
+                                autoComplete="new-password"
+                                className={cx(kcProps.kcInputClass)}
+                            />
                         </div>
+                    </div>
 
-                        <div className={cx(props.kcFormGroupClass)}>
-                            <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
-                                <div className={cx(props.kcFormOptionsWrapperClass)}>
-                                    {isAppInitiatedAction && (
-                                        <div className="checkbox">
-                                            <label>
-                                                <input type="checkbox" id="logout-sessions" name="logout-sessions" value="on" checked />
-                                                {msgStr("logoutOtherSessions")}
-                                            </label>
-                                        </div>
-                                    )}
-                                </div>
-                            </div>
+                    <div className={cx(kcProps.kcFormGroupClass, messagesPerField.printIfExists("password-confirm", kcProps.kcFormGroupErrorClass))}>
+                        <div className={cx(kcProps.kcLabelWrapperClass)}>
+                            <label htmlFor="password-confirm" className={cx(kcProps.kcLabelClass)}>
+                                {msg("passwordConfirm")}
+                            </label>
+                        </div>
+                        <div className={cx(kcProps.kcInputWrapperClass)}>
+                            <input
+                                type="password"
+                                id="password-confirm"
+                                name="password-confirm"
+                                autoComplete="new-password"
+                                className={cx(kcProps.kcInputClass)}
+                            />
+                        </div>
+                    </div>
 
-                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
-                                {isAppInitiatedAction ? (
-                                    <>
-                                        <input
-                                            className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonLargeClass)}
-                                            type="submit"
-                                            defaultValue={msgStr("doSubmit")}
-                                        />
-                                        <button
-                                            className={cx(props.kcButtonClass, props.kcButtonDefaultClass, props.kcButtonLargeClass)}
-                                            type="submit"
-                                            name="cancel-aia"
-                                            value="true"
-                                        >
-                                            {msg("doCancel")}
-                                        </button>
-                                    </>
-                                ) : (
-                                    <input
-                                        className={cx(
-                                            props.kcButtonClass,
-                                            props.kcButtonPrimaryClass,
-                                            props.kcButtonBlockClass,
-                                            props.kcButtonLargeClass
-                                        )}
-                                        type="submit"
-                                        defaultValue={msgStr("doSubmit")}
-                                    />
+                    <div className={cx(kcProps.kcFormGroupClass)}>
+                        <div id="kc-form-options" className={cx(kcProps.kcFormOptionsClass)}>
+                            <div className={cx(kcProps.kcFormOptionsWrapperClass)}>
+                                {isAppInitiatedAction && (
+                                    <div className="checkbox">
+                                        <label>
+                                            <input type="checkbox" id="logout-sessions" name="logout-sessions" value="on" checked />
+                                            {msgStr("logoutOtherSessions")}
+                                        </label>
+                                    </div>
                                 )}
                             </div>
                         </div>
-                    </form>
-                }
-            />
-        );
-    }
-);
+
+                        <div id="kc-form-buttons" className={cx(kcProps.kcFormButtonsClass)}>
+                            {isAppInitiatedAction ? (
+                                <>
+                                    <input
+                                        className={cx(kcProps.kcButtonClass, kcProps.kcButtonPrimaryClass, kcProps.kcButtonLargeClass)}
+                                        type="submit"
+                                        defaultValue={msgStr("doSubmit")}
+                                    />
+                                    <button
+                                        className={cx(kcProps.kcButtonClass, kcProps.kcButtonDefaultClass, kcProps.kcButtonLargeClass)}
+                                        type="submit"
+                                        name="cancel-aia"
+                                        value="true"
+                                    >
+                                        {msg("doCancel")}
+                                    </button>
+                                </>
+                            ) : (
+                                <input
+                                    className={cx(
+                                        kcProps.kcButtonClass,
+                                        kcProps.kcButtonPrimaryClass,
+                                        kcProps.kcButtonBlockClass,
+                                        kcProps.kcButtonLargeClass
+                                    )}
+                                    type="submit"
+                                    defaultValue={msgStr("doSubmit")}
+                                />
+                            )}
+                        </div>
+                    </div>
+                </form>
+            }
+        />
+    );
+});
 
 export default LoginUpdatePassword;
diff --git a/src/lib/components/LoginUpdateProfile.tsx b/src/lib/components/LoginUpdateProfile.tsx
index 5283d383..41407827 100644
--- a/src/lib/components/LoginUpdateProfile.tsx
+++ b/src/lib/components/LoginUpdateProfile.tsx
@@ -1,134 +1,137 @@
 import React, { memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 
-const LoginUpdateProfile = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.LoginUpdateProfile; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
-        const { cx } = useCssAndCx();
+export type LoginUpdateProfile = KcProps & {
+    kcContext: KcContextBase.LoginUpdateProfile;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
 
-        const { msg, msgStr } = i18n;
+const LoginUpdateProfile = memo((props: LoginUpdateProfile) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
 
-        const { url, user, messagesPerField, isAppInitiatedAction } = kcContext;
+    const { cx } = useCssAndCx();
 
-        return (
-            <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
-                headerNode={msg("loginProfileTitle")}
-                formNode={
-                    <form id="kc-update-profile-form" className={cx(props.kcFormClass)} action={url.loginAction} method="post">
-                        {user.editUsernameAllowed && (
-                            <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("username", props.kcFormGroupErrorClass))}>
-                                <div className={cx(props.kcLabelWrapperClass)}>
-                                    <label htmlFor="username" className={cx(props.kcLabelClass)}>
-                                        {msg("username")}
-                                    </label>
-                                </div>
-                                <div className={cx(props.kcInputWrapperClass)}>
-                                    <input
-                                        type="text"
-                                        id="username"
-                                        name="username"
-                                        defaultValue={user.username ?? ""}
-                                        className={cx(props.kcInputClass)}
-                                    />
-                                </div>
-                            </div>
-                        )}
+    const { msg, msgStr } = i18n;
 
-                        <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("email", props.kcFormGroupErrorClass))}>
-                            <div className={cx(props.kcLabelWrapperClass)}>
-                                <label htmlFor="email" className={cx(props.kcLabelClass)}>
-                                    {msg("email")}
+    const { url, user, messagesPerField, isAppInitiatedAction } = kcContext;
+
+    return (
+        <Template
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
+            headerNode={msg("loginProfileTitle")}
+            formNode={
+                <form id="kc-update-profile-form" className={cx(kcProps.kcFormClass)} action={url.loginAction} method="post">
+                    {user.editUsernameAllowed && (
+                        <div className={cx(kcProps.kcFormGroupClass, messagesPerField.printIfExists("username", kcProps.kcFormGroupErrorClass))}>
+                            <div className={cx(kcProps.kcLabelWrapperClass)}>
+                                <label htmlFor="username" className={cx(kcProps.kcLabelClass)}>
+                                    {msg("username")}
                                 </label>
                             </div>
-                            <div className={cx(props.kcInputWrapperClass)}>
-                                <input type="text" id="email" name="email" defaultValue={user.email ?? ""} className={cx(props.kcInputClass)} />
-                            </div>
-                        </div>
-
-                        <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("firstName", props.kcFormGroupErrorClass))}>
-                            <div className={cx(props.kcLabelWrapperClass)}>
-                                <label htmlFor="firstName" className={cx(props.kcLabelClass)}>
-                                    {msg("firstName")}
-                                </label>
-                            </div>
-                            <div className={cx(props.kcInputWrapperClass)}>
+                            <div className={cx(kcProps.kcInputWrapperClass)}>
                                 <input
                                     type="text"
-                                    id="firstName"
-                                    name="firstName"
-                                    defaultValue={user.firstName ?? ""}
-                                    className={cx(props.kcInputClass)}
+                                    id="username"
+                                    name="username"
+                                    defaultValue={user.username ?? ""}
+                                    className={cx(kcProps.kcInputClass)}
                                 />
                             </div>
                         </div>
+                    )}
 
-                        <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("lastName", props.kcFormGroupErrorClass))}>
-                            <div className={cx(props.kcLabelWrapperClass)}>
-                                <label htmlFor="lastName" className={cx(props.kcLabelClass)}>
-                                    {msg("lastName")}
-                                </label>
-                            </div>
-                            <div className={cx(props.kcInputWrapperClass)}>
-                                <input
-                                    type="text"
-                                    id="lastName"
-                                    name="lastName"
-                                    defaultValue={user.lastName ?? ""}
-                                    className={cx(props.kcInputClass)}
-                                />
-                            </div>
+                    <div className={cx(kcProps.kcFormGroupClass, messagesPerField.printIfExists("email", kcProps.kcFormGroupErrorClass))}>
+                        <div className={cx(kcProps.kcLabelWrapperClass)}>
+                            <label htmlFor="email" className={cx(kcProps.kcLabelClass)}>
+                                {msg("email")}
+                            </label>
+                        </div>
+                        <div className={cx(kcProps.kcInputWrapperClass)}>
+                            <input type="text" id="email" name="email" defaultValue={user.email ?? ""} className={cx(kcProps.kcInputClass)} />
+                        </div>
+                    </div>
+
+                    <div className={cx(kcProps.kcFormGroupClass, messagesPerField.printIfExists("firstName", kcProps.kcFormGroupErrorClass))}>
+                        <div className={cx(kcProps.kcLabelWrapperClass)}>
+                            <label htmlFor="firstName" className={cx(kcProps.kcLabelClass)}>
+                                {msg("firstName")}
+                            </label>
+                        </div>
+                        <div className={cx(kcProps.kcInputWrapperClass)}>
+                            <input
+                                type="text"
+                                id="firstName"
+                                name="firstName"
+                                defaultValue={user.firstName ?? ""}
+                                className={cx(kcProps.kcInputClass)}
+                            />
+                        </div>
+                    </div>
+
+                    <div className={cx(kcProps.kcFormGroupClass, messagesPerField.printIfExists("lastName", kcProps.kcFormGroupErrorClass))}>
+                        <div className={cx(kcProps.kcLabelWrapperClass)}>
+                            <label htmlFor="lastName" className={cx(kcProps.kcLabelClass)}>
+                                {msg("lastName")}
+                            </label>
+                        </div>
+                        <div className={cx(kcProps.kcInputWrapperClass)}>
+                            <input
+                                type="text"
+                                id="lastName"
+                                name="lastName"
+                                defaultValue={user.lastName ?? ""}
+                                className={cx(kcProps.kcInputClass)}
+                            />
+                        </div>
+                    </div>
+
+                    <div className={cx(kcProps.kcFormGroupClass)}>
+                        <div id="kc-form-options" className={cx(kcProps.kcFormOptionsClass)}>
+                            <div className={cx(kcProps.kcFormOptionsWrapperClass)} />
                         </div>
 
-                        <div className={cx(props.kcFormGroupClass)}>
-                            <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
-                                <div className={cx(props.kcFormOptionsWrapperClass)} />
-                            </div>
-
-                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
-                                {isAppInitiatedAction ? (
-                                    <>
-                                        <input
-                                            className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonLargeClass)}
-                                            type="submit"
-                                            defaultValue={msgStr("doSubmit")}
-                                        />
-                                        <button
-                                            className={cx(props.kcButtonClass, props.kcButtonDefaultClass, props.kcButtonLargeClass)}
-                                            type="submit"
-                                            name="cancel-aia"
-                                            value="true"
-                                        >
-                                            {msg("doCancel")}
-                                        </button>
-                                    </>
-                                ) : (
+                        <div id="kc-form-buttons" className={cx(kcProps.kcFormButtonsClass)}>
+                            {isAppInitiatedAction ? (
+                                <>
                                     <input
-                                        className={cx(
-                                            props.kcButtonClass,
-                                            props.kcButtonPrimaryClass,
-                                            props.kcButtonBlockClass,
-                                            props.kcButtonLargeClass
-                                        )}
+                                        className={cx(kcProps.kcButtonClass, kcProps.kcButtonPrimaryClass, kcProps.kcButtonLargeClass)}
                                         type="submit"
                                         defaultValue={msgStr("doSubmit")}
                                     />
-                                )}
-                            </div>
+                                    <button
+                                        className={cx(kcProps.kcButtonClass, kcProps.kcButtonDefaultClass, kcProps.kcButtonLargeClass)}
+                                        type="submit"
+                                        name="cancel-aia"
+                                        value="true"
+                                    >
+                                        {msg("doCancel")}
+                                    </button>
+                                </>
+                            ) : (
+                                <input
+                                    className={cx(
+                                        kcProps.kcButtonClass,
+                                        kcProps.kcButtonPrimaryClass,
+                                        kcProps.kcButtonBlockClass,
+                                        kcProps.kcButtonLargeClass
+                                    )}
+                                    type="submit"
+                                    defaultValue={msgStr("doSubmit")}
+                                />
+                            )}
                         </div>
-                    </form>
-                }
-            />
-        );
-    }
-);
+                    </div>
+                </form>
+            }
+        />
+    );
+});
 
 export default LoginUpdateProfile;
diff --git a/src/lib/components/LoginUsername.tsx b/src/lib/components/LoginUsername.tsx
index 4c8415a0..2f972fec 100644
--- a/src/lib/components/LoginUsername.tsx
+++ b/src/lib/components/LoginUsername.tsx
@@ -1,5 +1,6 @@
 import React, { useState, memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
@@ -7,162 +8,164 @@ import { useConstCallback } from "powerhooks/useConstCallback";
 import type { FormEventHandler } from "react";
 import type { I18n } from "../i18n";
 
-const LoginUsername = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.LoginUsername; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
-        const { social, realm, url, usernameHidden, login, registrationDisabled } = kcContext;
+export type LoginUsernameProps = KcProps & {
+    kcContext: KcContextBase.LoginUsername;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
 
-        const { msg, msgStr } = i18n;
+const LoginUsername = memo((props: LoginUsernameProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
 
-        const { cx } = useCssAndCx();
+    const { social, realm, url, usernameHidden, login, registrationDisabled } = kcContext;
 
-        const [isLoginButtonDisabled, setIsLoginButtonDisabled] = useState(false);
+    const { msg, msgStr } = i18n;
 
-        const onSubmit = useConstCallback<FormEventHandler<HTMLFormElement>>(e => {
-            e.preventDefault();
+    const { cx } = useCssAndCx();
 
-            setIsLoginButtonDisabled(true);
+    const [isLoginButtonDisabled, setIsLoginButtonDisabled] = useState(false);
 
-            const formElement = e.target as HTMLFormElement;
+    const onSubmit = useConstCallback<FormEventHandler<HTMLFormElement>>(e => {
+        e.preventDefault();
 
-            //NOTE: Even if we login with email Keycloak expect username and password in
-            //the POST request.
-            formElement.querySelector("input[name='email']")?.setAttribute("name", "username");
+        setIsLoginButtonDisabled(true);
 
-            formElement.submit();
-        });
+        const formElement = e.target as HTMLFormElement;
 
-        return (
-            <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
-                displayInfo={social.displayInfo}
-                displayWide={realm.password && social.providers !== undefined}
-                headerNode={msg("doLogIn")}
-                formNode={
-                    <div id="kc-form" className={cx(realm.password && social.providers !== undefined && props.kcContentWrapperClass)}>
-                        <div
-                            id="kc-form-wrapper"
-                            className={cx(
-                                realm.password && social.providers && [props.kcFormSocialAccountContentClass, props.kcFormSocialAccountClass]
-                            )}
-                        >
-                            {realm.password && (
-                                <form id="kc-form-login" onSubmit={onSubmit} action={url.loginAction} method="post">
-                                    <div className={cx(props.kcFormGroupClass)}>
-                                        {!usernameHidden &&
-                                            (() => {
-                                                const label = !realm.loginWithEmailAllowed
-                                                    ? "username"
-                                                    : realm.registrationEmailAsUsername
-                                                    ? "email"
-                                                    : "usernameOrEmail";
+        //NOTE: Even if we login with email Keycloak expect username and password in
+        //the POST request.
+        formElement.querySelector("input[name='email']")?.setAttribute("name", "username");
 
-                                                const autoCompleteHelper: typeof label = label === "usernameOrEmail" ? "username" : label;
+        formElement.submit();
+    });
 
-                                                return (
-                                                    <>
-                                                        <label htmlFor={autoCompleteHelper} className={cx(props.kcLabelClass)}>
-                                                            {msg(label)}
-                                                        </label>
-                                                        <input
-                                                            tabIndex={1}
-                                                            id={autoCompleteHelper}
-                                                            className={cx(props.kcInputClass)}
-                                                            //NOTE: This is used by Google Chrome auto fill so we use it to tell
-                                                            //the browser how to pre fill the form but before submit we put it back
-                                                            //to username because it is what keycloak expects.
-                                                            name={autoCompleteHelper}
-                                                            defaultValue={login.username ?? ""}
-                                                            type="text"
-                                                            autoFocus={true}
-                                                            autoComplete="off"
-                                                        />
-                                                    </>
-                                                );
-                                            })()}
-                                    </div>
-                                    <div className={cx(props.kcFormGroupClass, props.kcFormSettingClass)}>
-                                        <div id="kc-form-options">
-                                            {realm.rememberMe && !usernameHidden && (
-                                                <div className="checkbox">
-                                                    <label>
-                                                        <input
-                                                            tabIndex={3}
-                                                            id="rememberMe"
-                                                            name="rememberMe"
-                                                            type="checkbox"
-                                                            {...(login.rememberMe
-                                                                ? {
-                                                                      "checked": true
-                                                                  }
-                                                                : {})}
-                                                        />
-                                                        {msg("rememberMe")}
+    return (
+        <Template
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
+            displayInfo={social.displayInfo}
+            displayWide={realm.password && social.providers !== undefined}
+            headerNode={msg("doLogIn")}
+            formNode={
+                <div id="kc-form" className={cx(realm.password && social.providers !== undefined && kcProps.kcContentWrapperClass)}>
+                    <div
+                        id="kc-form-wrapper"
+                        className={cx(
+                            realm.password && social.providers && [kcProps.kcFormSocialAccountContentClass, kcProps.kcFormSocialAccountClass]
+                        )}
+                    >
+                        {realm.password && (
+                            <form id="kc-form-login" onSubmit={onSubmit} action={url.loginAction} method="post">
+                                <div className={cx(kcProps.kcFormGroupClass)}>
+                                    {!usernameHidden &&
+                                        (() => {
+                                            const label = !realm.loginWithEmailAllowed
+                                                ? "username"
+                                                : realm.registrationEmailAsUsername
+                                                ? "email"
+                                                : "usernameOrEmail";
+
+                                            const autoCompleteHelper: typeof label = label === "usernameOrEmail" ? "username" : label;
+
+                                            return (
+                                                <>
+                                                    <label htmlFor={autoCompleteHelper} className={cx(kcProps.kcLabelClass)}>
+                                                        {msg(label)}
                                                     </label>
-                                                </div>
-                                            )}
-                                        </div>
+                                                    <input
+                                                        tabIndex={1}
+                                                        id={autoCompleteHelper}
+                                                        className={cx(kcProps.kcInputClass)}
+                                                        //NOTE: This is used by Google Chrome auto fill so we use it to tell
+                                                        //the browser how to pre fill the form but before submit we put it back
+                                                        //to username because it is what keycloak expects.
+                                                        name={autoCompleteHelper}
+                                                        defaultValue={login.username ?? ""}
+                                                        type="text"
+                                                        autoFocus={true}
+                                                        autoComplete="off"
+                                                    />
+                                                </>
+                                            );
+                                        })()}
+                                </div>
+                                <div className={cx(kcProps.kcFormGroupClass, kcProps.kcFormSettingClass)}>
+                                    <div id="kc-form-options">
+                                        {realm.rememberMe && !usernameHidden && (
+                                            <div className="checkbox">
+                                                <label>
+                                                    <input
+                                                        tabIndex={3}
+                                                        id="rememberMe"
+                                                        name="rememberMe"
+                                                        type="checkbox"
+                                                        {...(login.rememberMe
+                                                            ? {
+                                                                  "checked": true
+                                                              }
+                                                            : {})}
+                                                    />
+                                                    {msg("rememberMe")}
+                                                </label>
+                                            </div>
+                                        )}
                                     </div>
-                                    <div id="kc-form-buttons" className={cx(props.kcFormGroupClass)}>
-                                        <input
-                                            tabIndex={4}
-                                            className={cx(
-                                                props.kcButtonClass,
-                                                props.kcButtonPrimaryClass,
-                                                props.kcButtonBlockClass,
-                                                props.kcButtonLargeClass
-                                            )}
-                                            name="login"
-                                            id="kc-login"
-                                            type="submit"
-                                            value={msgStr("doLogIn")}
-                                            disabled={isLoginButtonDisabled}
-                                        />
-                                    </div>
-                                </form>
-                            )}
-                        </div>
-                        {realm.password && social.providers !== undefined && (
-                            <div id="kc-social-providers" className={cx(props.kcFormSocialAccountContentClass, props.kcFormSocialAccountClass)}>
-                                <ul
-                                    className={cx(
-                                        props.kcFormSocialAccountListClass,
-                                        social.providers.length > 4 && props.kcFormSocialAccountDoubleListClass
-                                    )}
-                                >
-                                    {social.providers.map(p => (
-                                        <li key={p.providerId} className={cx(props.kcFormSocialAccountListLinkClass)}>
-                                            <a href={p.loginUrl} id={`zocial-${p.alias}`} className={cx("zocial", p.providerId)}>
-                                                <span>{p.displayName}</span>
-                                            </a>
-                                        </li>
-                                    ))}
-                                </ul>
-                            </div>
+                                </div>
+                                <div id="kc-form-buttons" className={cx(kcProps.kcFormGroupClass)}>
+                                    <input
+                                        tabIndex={4}
+                                        className={cx(
+                                            kcProps.kcButtonClass,
+                                            kcProps.kcButtonPrimaryClass,
+                                            kcProps.kcButtonBlockClass,
+                                            kcProps.kcButtonLargeClass
+                                        )}
+                                        name="login"
+                                        id="kc-login"
+                                        type="submit"
+                                        value={msgStr("doLogIn")}
+                                        disabled={isLoginButtonDisabled}
+                                    />
+                                </div>
+                            </form>
                         )}
                     </div>
-                }
-                infoNode={
-                    realm.password &&
-                    realm.registrationAllowed &&
-                    !registrationDisabled && (
-                        <div id="kc-registration">
-                            <span>
-                                {msg("noAccount")}
-                                <a tabIndex={6} href={url.registrationUrl}>
-                                    {msg("doRegister")}
-                                </a>
-                            </span>
+                    {realm.password && social.providers !== undefined && (
+                        <div id="kc-social-providers" className={cx(kcProps.kcFormSocialAccountContentClass, kcProps.kcFormSocialAccountClass)}>
+                            <ul
+                                className={cx(
+                                    kcProps.kcFormSocialAccountListClass,
+                                    social.providers.length > 4 && kcProps.kcFormSocialAccountDoubleListClass
+                                )}
+                            >
+                                {social.providers.map(p => (
+                                    <li key={p.providerId} className={cx(kcProps.kcFormSocialAccountListLinkClass)}>
+                                        <a href={p.loginUrl} id={`zocial-${p.alias}`} className={cx("zocial", p.providerId)}>
+                                            <span>{p.displayName}</span>
+                                        </a>
+                                    </li>
+                                ))}
+                            </ul>
                         </div>
-                    )
-                }
-            />
-        );
-    }
-);
+                    )}
+                </div>
+            }
+            infoNode={
+                realm.password &&
+                realm.registrationAllowed &&
+                !registrationDisabled && (
+                    <div id="kc-registration">
+                        <span>
+                            {msg("noAccount")}
+                            <a tabIndex={6} href={url.registrationUrl}>
+                                {msg("doRegister")}
+                            </a>
+                        </span>
+                    </div>
+                )
+            }
+        />
+    );
+});
 
 export default LoginUsername;
diff --git a/src/lib/components/LoginVerifyEmail.tsx b/src/lib/components/LoginVerifyEmail.tsx
index 77901e34..8ea479af 100644
--- a/src/lib/components/LoginVerifyEmail.tsx
+++ b/src/lib/components/LoginVerifyEmail.tsx
@@ -1,40 +1,43 @@
 import React, { memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import type { I18n } from "../i18n";
 
-const LoginVerifyEmail = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.LoginVerifyEmail; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
-        const { msg } = i18n;
+export type LoginVerifyEmailProps = KcProps & {
+    kcContext: KcContextBase.LoginVerifyEmail;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
 
-        const { url, user } = kcContext;
+const LoginVerifyEmail = memo((props: LoginVerifyEmailProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
 
-        return (
-            <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
-                displayMessage={false}
-                headerNode={msg("emailVerifyTitle")}
-                formNode={
-                    <>
-                        <p className="instruction">{msg("emailVerifyInstruction1", user?.email)}</p>
-                        <p className="instruction">
-                            {msg("emailVerifyInstruction2")}
-                            <br />
-                            <a href={url.loginAction}>{msg("doClickHere")}</a>
-                            &nbsp;
-                            {msg("emailVerifyInstruction3")}
-                        </p>
-                    </>
-                }
-            />
-        );
-    }
-);
+    const { msg } = i18n;
+
+    const { url, user } = kcContext;
+
+    return (
+        <Template
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
+            displayMessage={false}
+            headerNode={msg("emailVerifyTitle")}
+            formNode={
+                <>
+                    <p className="instruction">{msg("emailVerifyInstruction1", user?.email)}</p>
+                    <p className="instruction">
+                        {msg("emailVerifyInstruction2")}
+                        <br />
+                        <a href={url.loginAction}>{msg("doClickHere")}</a>
+                        &nbsp;
+                        {msg("emailVerifyInstruction3")}
+                    </p>
+                </>
+            }
+        />
+    );
+});
 
 export default LoginVerifyEmail;
diff --git a/src/lib/components/LogoutConfirm.tsx b/src/lib/components/LogoutConfirm.tsx
index 1b341205..5a0adf09 100644
--- a/src/lib/components/LogoutConfirm.tsx
+++ b/src/lib/components/LogoutConfirm.tsx
@@ -1,68 +1,71 @@
 import React, { memo } from "react";
 import { useCssAndCx } from "../tools/useCssAndCx";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import type { I18n } from "../i18n";
 
-const LogoutConfirm = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.LogoutConfirm; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
-        const { url, client, logoutConfirm } = kcContext;
+export type LogoutConfirmProps = KcProps & {
+    kcContext: KcContextBase.LogoutConfirm;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
 
-        const { cx } = useCssAndCx();
+const LogoutConfirm = memo((props: LogoutConfirmProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
 
-        const { msg, msgStr } = i18n;
+    const { url, client, logoutConfirm } = kcContext;
 
-        return (
-            <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
-                displayMessage={false}
-                headerNode={msg("logoutConfirmTitle")}
-                formNode={
-                    <>
-                        <div id="kc-logout-confirm" className="content-area">
-                            <p className="instruction">{msg("logoutConfirmHeader")}</p>
-                            <form className="form-actions" action={url.logoutConfirmAction} method="POST">
-                                <input type="hidden" name="session_code" value={logoutConfirm.code} />
-                                <div className={cx(props.kcFormGroupClass)}>
-                                    <div id="kc-form-options">
-                                        <div className={cx(props.kcFormOptionsWrapperClass)}></div>
-                                    </div>
-                                    <div id="kc-form-buttons" className={cx(props.kcFormGroupClass)}>
-                                        <input
-                                            tabIndex={4}
-                                            className={cx(
-                                                props.kcButtonClass,
-                                                props.kcButtonPrimaryClass,
-                                                props.kcButtonBlockClass,
-                                                props.kcButtonLargeClass
-                                            )}
-                                            name="confirmLogout"
-                                            id="kc-logout"
-                                            type="submit"
-                                            value={msgStr("doLogout")}
-                                        />
-                                    </div>
+    const { cx } = useCssAndCx();
+
+    const { msg, msgStr } = i18n;
+
+    return (
+        <Template
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
+            displayMessage={false}
+            headerNode={msg("logoutConfirmTitle")}
+            formNode={
+                <>
+                    <div id="kc-logout-confirm" className="content-area">
+                        <p className="instruction">{msg("logoutConfirmHeader")}</p>
+                        <form className="form-actions" action={url.logoutConfirmAction} method="POST">
+                            <input type="hidden" name="session_code" value={logoutConfirm.code} />
+                            <div className={cx(kcProps.kcFormGroupClass)}>
+                                <div id="kc-form-options">
+                                    <div className={cx(kcProps.kcFormOptionsWrapperClass)}></div>
+                                </div>
+                                <div id="kc-form-buttons" className={cx(kcProps.kcFormGroupClass)}>
+                                    <input
+                                        tabIndex={4}
+                                        className={cx(
+                                            kcProps.kcButtonClass,
+                                            kcProps.kcButtonPrimaryClass,
+                                            kcProps.kcButtonBlockClass,
+                                            kcProps.kcButtonLargeClass
+                                        )}
+                                        name="confirmLogout"
+                                        id="kc-logout"
+                                        type="submit"
+                                        value={msgStr("doLogout")}
+                                    />
                                 </div>
-                            </form>
-                            <div id="kc-info-message">
-                                {!logoutConfirm.skipLink && client.baseUrl && (
-                                    <p>
-                                        <a href={client.baseUrl} dangerouslySetInnerHTML={{ __html: msgStr("backToApplication") }} />
-                                    </p>
-                                )}
                             </div>
+                        </form>
+                        <div id="kc-info-message">
+                            {!logoutConfirm.skipLink && client.baseUrl && (
+                                <p>
+                                    <a href={client.baseUrl} dangerouslySetInnerHTML={{ __html: msgStr("backToApplication") }} />
+                                </p>
+                            )}
                         </div>
-                    </>
-                }
-            />
-        );
-    }
-);
+                    </div>
+                </>
+            }
+        />
+    );
+});
 
 export default LogoutConfirm;
diff --git a/src/lib/components/Register.tsx b/src/lib/components/Register.tsx
index 885fb092..3ba99d4e 100644
--- a/src/lib/components/Register.tsx
+++ b/src/lib/components/Register.tsx
@@ -1,169 +1,172 @@
 import React, { memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 
-const Register = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.Register; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
-        const { url, messagesPerField, register, realm, passwordRequired, recaptchaRequired, recaptchaSiteKey } = kcContext;
+export type RegisterProps = KcProps & {
+    kcContext: KcContextBase.Register;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
 
-        const { msg, msgStr } = i18n;
+const Register = memo((props: RegisterProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
 
-        const { cx } = useCssAndCx();
+    const { url, messagesPerField, register, realm, passwordRequired, recaptchaRequired, recaptchaSiteKey } = kcContext;
 
-        return (
-            <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
-                headerNode={msg("registerTitle")}
-                formNode={
-                    <form id="kc-register-form" className={cx(props.kcFormClass)} action={url.registrationAction} method="post">
-                        <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("firstName", props.kcFormGroupErrorClass))}>
-                            <div className={cx(props.kcLabelWrapperClass)}>
-                                <label htmlFor="firstName" className={cx(props.kcLabelClass)}>
-                                    {msg("firstName")}
+    const { msg, msgStr } = i18n;
+
+    const { cx } = useCssAndCx();
+
+    return (
+        <Template
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
+            headerNode={msg("registerTitle")}
+            formNode={
+                <form id="kc-register-form" className={cx(kcProps.kcFormClass)} action={url.registrationAction} method="post">
+                    <div className={cx(kcProps.kcFormGroupClass, messagesPerField.printIfExists("firstName", kcProps.kcFormGroupErrorClass))}>
+                        <div className={cx(kcProps.kcLabelWrapperClass)}>
+                            <label htmlFor="firstName" className={cx(kcProps.kcLabelClass)}>
+                                {msg("firstName")}
+                            </label>
+                        </div>
+                        <div className={cx(kcProps.kcInputWrapperClass)}>
+                            <input
+                                type="text"
+                                id="firstName"
+                                className={cx(kcProps.kcInputClass)}
+                                name="firstName"
+                                defaultValue={register.formData.firstName ?? ""}
+                            />
+                        </div>
+                    </div>
+
+                    <div className={cx(kcProps.kcFormGroupClass, messagesPerField.printIfExists("lastName", kcProps.kcFormGroupErrorClass))}>
+                        <div className={cx(kcProps.kcLabelWrapperClass)}>
+                            <label htmlFor="lastName" className={cx(kcProps.kcLabelClass)}>
+                                {msg("lastName")}
+                            </label>
+                        </div>
+                        <div className={cx(kcProps.kcInputWrapperClass)}>
+                            <input
+                                type="text"
+                                id="lastName"
+                                className={cx(kcProps.kcInputClass)}
+                                name="lastName"
+                                defaultValue={register.formData.lastName ?? ""}
+                            />
+                        </div>
+                    </div>
+
+                    <div className={cx(kcProps.kcFormGroupClass, messagesPerField.printIfExists("email", kcProps.kcFormGroupErrorClass))}>
+                        <div className={cx(kcProps.kcLabelWrapperClass)}>
+                            <label htmlFor="email" className={cx(kcProps.kcLabelClass)}>
+                                {msg("email")}
+                            </label>
+                        </div>
+                        <div className={cx(kcProps.kcInputWrapperClass)}>
+                            <input
+                                type="text"
+                                id="email"
+                                className={cx(kcProps.kcInputClass)}
+                                name="email"
+                                defaultValue={register.formData.email ?? ""}
+                                autoComplete="email"
+                            />
+                        </div>
+                    </div>
+                    {!realm.registrationEmailAsUsername && (
+                        <div className={cx(kcProps.kcFormGroupClass, messagesPerField.printIfExists("username", kcProps.kcFormGroupErrorClass))}>
+                            <div className={cx(kcProps.kcLabelWrapperClass)}>
+                                <label htmlFor="username" className={cx(kcProps.kcLabelClass)}>
+                                    {msg("username")}
                                 </label>
                             </div>
-                            <div className={cx(props.kcInputWrapperClass)}>
+                            <div className={cx(kcProps.kcInputWrapperClass)}>
                                 <input
                                     type="text"
-                                    id="firstName"
-                                    className={cx(props.kcInputClass)}
-                                    name="firstName"
-                                    defaultValue={register.formData.firstName ?? ""}
+                                    id="username"
+                                    className={cx(kcProps.kcInputClass)}
+                                    name="username"
+                                    defaultValue={register.formData.username ?? ""}
+                                    autoComplete="username"
                                 />
                             </div>
                         </div>
-
-                        <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("lastName", props.kcFormGroupErrorClass))}>
-                            <div className={cx(props.kcLabelWrapperClass)}>
-                                <label htmlFor="lastName" className={cx(props.kcLabelClass)}>
-                                    {msg("lastName")}
-                                </label>
-                            </div>
-                            <div className={cx(props.kcInputWrapperClass)}>
-                                <input
-                                    type="text"
-                                    id="lastName"
-                                    className={cx(props.kcInputClass)}
-                                    name="lastName"
-                                    defaultValue={register.formData.lastName ?? ""}
-                                />
-                            </div>
-                        </div>
-
-                        <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("email", props.kcFormGroupErrorClass))}>
-                            <div className={cx(props.kcLabelWrapperClass)}>
-                                <label htmlFor="email" className={cx(props.kcLabelClass)}>
-                                    {msg("email")}
-                                </label>
-                            </div>
-                            <div className={cx(props.kcInputWrapperClass)}>
-                                <input
-                                    type="text"
-                                    id="email"
-                                    className={cx(props.kcInputClass)}
-                                    name="email"
-                                    defaultValue={register.formData.email ?? ""}
-                                    autoComplete="email"
-                                />
-                            </div>
-                        </div>
-                        {!realm.registrationEmailAsUsername && (
-                            <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("username", props.kcFormGroupErrorClass))}>
-                                <div className={cx(props.kcLabelWrapperClass)}>
-                                    <label htmlFor="username" className={cx(props.kcLabelClass)}>
-                                        {msg("username")}
+                    )}
+                    {passwordRequired && (
+                        <>
+                            <div className={cx(kcProps.kcFormGroupClass, messagesPerField.printIfExists("password", kcProps.kcFormGroupErrorClass))}>
+                                <div className={cx(kcProps.kcLabelWrapperClass)}>
+                                    <label htmlFor="password" className={cx(kcProps.kcLabelClass)}>
+                                        {msg("password")}
                                     </label>
                                 </div>
-                                <div className={cx(props.kcInputWrapperClass)}>
+                                <div className={cx(kcProps.kcInputWrapperClass)}>
                                     <input
-                                        type="text"
-                                        id="username"
-                                        className={cx(props.kcInputClass)}
-                                        name="username"
-                                        defaultValue={register.formData.username ?? ""}
-                                        autoComplete="username"
+                                        type="password"
+                                        id="password"
+                                        className={cx(kcProps.kcInputClass)}
+                                        name="password"
+                                        autoComplete="new-password"
                                     />
                                 </div>
                             </div>
-                        )}
-                        {passwordRequired && (
-                            <>
-                                <div className={cx(props.kcFormGroupClass, messagesPerField.printIfExists("password", props.kcFormGroupErrorClass))}>
-                                    <div className={cx(props.kcLabelWrapperClass)}>
-                                        <label htmlFor="password" className={cx(props.kcLabelClass)}>
-                                            {msg("password")}
-                                        </label>
-                                    </div>
-                                    <div className={cx(props.kcInputWrapperClass)}>
-                                        <input
-                                            type="password"
-                                            id="password"
-                                            className={cx(props.kcInputClass)}
-                                            name="password"
-                                            autoComplete="new-password"
-                                        />
-                                    </div>
-                                </div>
 
-                                <div
-                                    className={cx(
-                                        props.kcFormGroupClass,
-                                        messagesPerField.printIfExists("password-confirm", props.kcFormGroupErrorClass)
-                                    )}
-                                >
-                                    <div className={cx(props.kcLabelWrapperClass)}>
-                                        <label htmlFor="password-confirm" className={cx(props.kcLabelClass)}>
-                                            {msg("passwordConfirm")}
-                                        </label>
-                                    </div>
-                                    <div className={cx(props.kcInputWrapperClass)}>
-                                        <input type="password" id="password-confirm" className={cx(props.kcInputClass)} name="password-confirm" />
-                                    </div>
+                            <div
+                                className={cx(
+                                    kcProps.kcFormGroupClass,
+                                    messagesPerField.printIfExists("password-confirm", kcProps.kcFormGroupErrorClass)
+                                )}
+                            >
+                                <div className={cx(kcProps.kcLabelWrapperClass)}>
+                                    <label htmlFor="password-confirm" className={cx(kcProps.kcLabelClass)}>
+                                        {msg("passwordConfirm")}
+                                    </label>
                                 </div>
-                            </>
-                        )}
-                        {recaptchaRequired && (
-                            <div className="form-group">
-                                <div className={cx(props.kcInputWrapperClass)}>
-                                    <div className="g-recaptcha" data-size="compact" data-sitekey={recaptchaSiteKey}></div>
+                                <div className={cx(kcProps.kcInputWrapperClass)}>
+                                    <input type="password" id="password-confirm" className={cx(kcProps.kcInputClass)} name="password-confirm" />
                                 </div>
                             </div>
-                        )}
-                        <div className={cx(props.kcFormGroupClass)}>
-                            <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
-                                <div className={cx(props.kcFormOptionsWrapperClass)}>
-                                    <span>
-                                        <a href={url.loginUrl}>{msg("backToLogin")}</a>
-                                    </span>
-                                </div>
-                            </div>
-
-                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
-                                <input
-                                    className={cx(
-                                        props.kcButtonClass,
-                                        props.kcButtonPrimaryClass,
-                                        props.kcButtonBlockClass,
-                                        props.kcButtonLargeClass
-                                    )}
-                                    type="submit"
-                                    value={msgStr("doRegister")}
-                                />
+                        </>
+                    )}
+                    {recaptchaRequired && (
+                        <div className="form-group">
+                            <div className={cx(kcProps.kcInputWrapperClass)}>
+                                <div className="g-recaptcha" data-size="compact" data-sitekey={recaptchaSiteKey}></div>
                             </div>
                         </div>
-                    </form>
-                }
-            />
-        );
-    }
-);
+                    )}
+                    <div className={cx(kcProps.kcFormGroupClass)}>
+                        <div id="kc-form-options" className={cx(kcProps.kcFormOptionsClass)}>
+                            <div className={cx(kcProps.kcFormOptionsWrapperClass)}>
+                                <span>
+                                    <a href={url.loginUrl}>{msg("backToLogin")}</a>
+                                </span>
+                            </div>
+                        </div>
+
+                        <div id="kc-form-buttons" className={cx(kcProps.kcFormButtonsClass)}>
+                            <input
+                                className={cx(
+                                    kcProps.kcButtonClass,
+                                    kcProps.kcButtonPrimaryClass,
+                                    kcProps.kcButtonBlockClass,
+                                    kcProps.kcButtonLargeClass
+                                )}
+                                type="submit"
+                                value={msgStr("doRegister")}
+                            />
+                        </div>
+                    </div>
+                </form>
+            }
+        />
+    );
+});
 
 export default Register;
diff --git a/src/lib/components/RegisterUserProfile.tsx b/src/lib/components/RegisterUserProfile.tsx
index 50485cae..c7a750d4 100644
--- a/src/lib/components/RegisterUserProfile.tsx
+++ b/src/lib/components/RegisterUserProfile.tsx
@@ -1,78 +1,81 @@
 import React, { useMemo, memo, useState } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 import { UserProfileFormFields } from "./shared/UserProfileCommons";
 
-const RegisterUserProfile = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props_
-    }: { kcContext: KcContextBase.RegisterUserProfile; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
-        const { url, messagesPerField, recaptchaRequired, recaptchaSiteKey } = kcContext;
+export type RegisterUserProfileProps = KcProps & {
+    kcContext: KcContextBase.RegisterUserProfile;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
 
-        const { msg, msgStr } = i18n;
+const RegisterUserProfile = memo((props: RegisterUserProfileProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps_ } = props;
 
-        const { cx, css } = useCssAndCx();
+    const { url, messagesPerField, recaptchaRequired, recaptchaSiteKey } = kcContext;
 
-        const props = useMemo(
-            () => ({
-                ...props_,
-                "kcFormGroupClass": cx(props_.kcFormGroupClass, css({ "marginBottom": 20 }))
-            }),
-            [cx, css]
-        );
+    const { msg, msgStr } = i18n;
 
-        const [isFomSubmittable, setIsFomSubmittable] = useState(false);
+    const { cx, css } = useCssAndCx();
 
-        return (
-            <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
-                displayMessage={messagesPerField.exists("global")}
-                displayRequiredFields={true}
-                headerNode={msg("registerTitle")}
-                formNode={
-                    <form id="kc-register-form" className={cx(props.kcFormClass)} action={url.registrationAction} method="post">
-                        <UserProfileFormFields kcContext={kcContext} onIsFormSubmittableValueChange={setIsFomSubmittable} i18n={i18n} {...props} />
-                        {recaptchaRequired && (
-                            <div className="form-group">
-                                <div className={cx(props.kcInputWrapperClass)}>
-                                    <div className="g-recaptcha" data-size="compact" data-sitekey={recaptchaSiteKey} />
-                                </div>
-                            </div>
-                        )}
-                        <div className={cx(props.kcFormGroupClass)}>
-                            <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
-                                <div className={cx(props.kcFormOptionsWrapperClass)}>
-                                    <span>
-                                        <a href={url.loginUrl}>{msg("backToLogin")}</a>
-                                    </span>
-                                </div>
-                            </div>
+    const kcProps = useMemo(
+        () => ({
+            ...kcProps_,
+            "kcFormGroupClass": cx(kcProps_.kcFormGroupClass, css({ "marginBottom": 20 }))
+        }),
+        [cx, css]
+    );
 
-                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
-                                <input
-                                    className={cx(
-                                        props.kcButtonClass,
-                                        props.kcButtonPrimaryClass,
-                                        props.kcButtonBlockClass,
-                                        props.kcButtonLargeClass
-                                    )}
-                                    type="submit"
-                                    value={msgStr("doRegister")}
-                                    disabled={!isFomSubmittable}
-                                />
+    const [isFomSubmittable, setIsFomSubmittable] = useState(false);
+
+    return (
+        <Template
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
+            displayMessage={messagesPerField.exists("global")}
+            displayRequiredFields={true}
+            headerNode={msg("registerTitle")}
+            formNode={
+                <form id="kc-register-form" className={cx(kcProps.kcFormClass)} action={url.registrationAction} method="post">
+                    <UserProfileFormFields kcContext={kcContext} onIsFormSubmittableValueChange={setIsFomSubmittable} i18n={i18n} {...kcProps} />
+                    {recaptchaRequired && (
+                        <div className="form-group">
+                            <div className={cx(kcProps.kcInputWrapperClass)}>
+                                <div className="g-recaptcha" data-size="compact" data-sitekey={recaptchaSiteKey} />
                             </div>
                         </div>
-                    </form>
-                }
-            />
-        );
-    }
-);
+                    )}
+                    <div className={cx(kcProps.kcFormGroupClass)}>
+                        <div id="kc-form-options" className={cx(kcProps.kcFormOptionsClass)}>
+                            <div className={cx(kcProps.kcFormOptionsWrapperClass)}>
+                                <span>
+                                    <a href={url.loginUrl}>{msg("backToLogin")}</a>
+                                </span>
+                            </div>
+                        </div>
+
+                        <div id="kc-form-buttons" className={cx(kcProps.kcFormButtonsClass)}>
+                            <input
+                                className={cx(
+                                    kcProps.kcButtonClass,
+                                    kcProps.kcButtonPrimaryClass,
+                                    kcProps.kcButtonBlockClass,
+                                    kcProps.kcButtonLargeClass
+                                )}
+                                type="submit"
+                                value={msgStr("doRegister")}
+                                disabled={!isFomSubmittable}
+                            />
+                        </div>
+                    </div>
+                </form>
+            }
+        />
+    );
+});
 
 export default RegisterUserProfile;
diff --git a/src/lib/components/Terms.tsx b/src/lib/components/Terms.tsx
index 53eb0214..bdd0307d 100644
--- a/src/lib/components/Terms.tsx
+++ b/src/lib/components/Terms.tsx
@@ -1,5 +1,6 @@
 import React, { useEffect, memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
@@ -12,6 +13,7 @@ import memoize from "memoizee";
 import { useConst } from "powerhooks/useConst";
 import { useConstCallback } from "powerhooks/useConstCallback";
 import { Markdown } from "../tools/Markdown";
+import type { Extends } from "tsafe";
 
 export const evtTermMarkdown = Evt.create<string | undefined>(undefined);
 
@@ -22,7 +24,7 @@ export type KcContextLike = {
     };
 };
 
-assert<KcContextBase extends KcContextLike ? true : false>();
+assert<Extends<KcContextBase, KcContextLike>>();
 
 /** Allow to avoid bundling the terms and download it on demand*/
 export function useDownloadTerms(params: {
@@ -54,61 +56,63 @@ export function useDownloadTerms(params: {
     }, []);
 }
 
-const Terms = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.Terms; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
-        const { msg, msgStr } = i18n;
+export type TermsProps = KcProps & {
+    kcContext: KcContextBase.Terms;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
 
-        useRerenderOnStateChange(evtTermMarkdown);
+const Terms = memo((props: TermsProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
 
-        const { cx } = useCssAndCx();
+    const { msg, msgStr } = i18n;
 
-        const { url } = kcContext;
+    useRerenderOnStateChange(evtTermMarkdown);
 
-        if (evtTermMarkdown.state === undefined) {
-            return null;
-        }
+    const { cx } = useCssAndCx();
 
-        return (
-            <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
-                displayMessage={false}
-                headerNode={msg("termsTitle")}
-                formNode={
-                    <>
-                        <div id="kc-terms-text">{evtTermMarkdown.state && <Markdown>{evtTermMarkdown.state}</Markdown>}</div>
-                        <form className="form-actions" action={url.loginAction} method="POST">
-                            <input
-                                className={cx(
-                                    props.kcButtonClass,
-                                    props.kcButtonClass,
-                                    props.kcButtonClass,
-                                    props.kcButtonPrimaryClass,
-                                    props.kcButtonLargeClass
-                                )}
-                                name="accept"
-                                id="kc-accept"
-                                type="submit"
-                                value={msgStr("doAccept")}
-                            />
-                            <input
-                                className={cx(props.kcButtonClass, props.kcButtonDefaultClass, props.kcButtonLargeClass)}
-                                name="cancel"
-                                id="kc-decline"
-                                type="submit"
-                                value={msgStr("doDecline")}
-                            />
-                        </form>
-                        <div className="clearfix" />
-                    </>
-                }
-            />
-        );
+    const { url } = kcContext;
+
+    if (evtTermMarkdown.state === undefined) {
+        return null;
     }
-);
+
+    return (
+        <Template
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
+            displayMessage={false}
+            headerNode={msg("termsTitle")}
+            formNode={
+                <>
+                    <div id="kc-terms-text">{evtTermMarkdown.state && <Markdown>{evtTermMarkdown.state}</Markdown>}</div>
+                    <form className="form-actions" action={url.loginAction} method="POST">
+                        <input
+                            className={cx(
+                                kcProps.kcButtonClass,
+                                kcProps.kcButtonClass,
+                                kcProps.kcButtonClass,
+                                kcProps.kcButtonPrimaryClass,
+                                kcProps.kcButtonLargeClass
+                            )}
+                            name="accept"
+                            id="kc-accept"
+                            type="submit"
+                            value={msgStr("doAccept")}
+                        />
+                        <input
+                            className={cx(kcProps.kcButtonClass, kcProps.kcButtonDefaultClass, kcProps.kcButtonLargeClass)}
+                            name="cancel"
+                            id="kc-decline"
+                            type="submit"
+                            value={msgStr("doDecline")}
+                        />
+                    </form>
+                    <div className="clearfix" />
+                </>
+            }
+        />
+    );
+});
 
 export default Terms;
diff --git a/src/lib/components/UpdateUserProfile.tsx b/src/lib/components/UpdateUserProfile.tsx
index ca02dc4e..8e39b616 100644
--- a/src/lib/components/UpdateUserProfile.tsx
+++ b/src/lib/components/UpdateUserProfile.tsx
@@ -1,77 +1,80 @@
 import React, { useState, memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
 import type { I18n } from "../i18n";
 import { UserProfileFormFields } from "./shared/UserProfileCommons";
 
-const UpdateUserProfile = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.UpdateUserProfile; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
-        const { cx } = useCssAndCx();
+export type UpdateUserProfileProps = KcProps & {
+    kcContext: KcContextBase.UpdateUserProfile;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
 
-        const { msg, msgStr } = i18n;
+const UpdateUserProfile = memo((props: UpdateUserProfileProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
 
-        const { url, isAppInitiatedAction } = kcContext;
+    const { cx } = useCssAndCx();
 
-        const [isFomSubmittable, setIsFomSubmittable] = useState(false);
+    const { msg, msgStr } = i18n;
 
-        return (
-            <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
-                headerNode={msg("loginProfileTitle")}
-                formNode={
-                    <form id="kc-update-profile-form" className={cx(props.kcFormClass)} action={url.loginAction} method="post">
-                        <UserProfileFormFields kcContext={kcContext} onIsFormSubmittableValueChange={setIsFomSubmittable} i18n={i18n} {...props} />
+    const { url, isAppInitiatedAction } = kcContext;
 
-                        <div className={cx(props.kcFormGroupClass)}>
-                            <div id="kc-form-options" className={cx(props.kcFormOptionsClass)}>
-                                <div className={cx(props.kcFormOptionsWrapperClass)}></div>
-                            </div>
+    const [isFomSubmittable, setIsFomSubmittable] = useState(false);
 
-                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
-                                {isAppInitiatedAction ? (
-                                    <>
-                                        <input
-                                            className={cx(props.kcButtonClass, props.kcButtonPrimaryClass, props.kcButtonLargeClass)}
-                                            type="submit"
-                                            value={msgStr("doSubmit")}
-                                        />
-                                        <button
-                                            className={cx(props.kcButtonClass, props.kcButtonDefaultClass, props.kcButtonLargeClass)}
-                                            type="submit"
-                                            name="cancel-aia"
-                                            value="true"
-                                            formNoValidate
-                                        >
-                                            {msg("doCancel")}
-                                        </button>
-                                    </>
-                                ) : (
-                                    <input
-                                        className={cx(
-                                            props.kcButtonClass,
-                                            props.kcButtonPrimaryClass,
-                                            props.kcButtonBlockClass,
-                                            props.kcButtonLargeClass
-                                        )}
-                                        type="submit"
-                                        defaultValue={msgStr("doSubmit")}
-                                        disabled={!isFomSubmittable}
-                                    />
-                                )}
-                            </div>
+    return (
+        <Template
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
+            headerNode={msg("loginProfileTitle")}
+            formNode={
+                <form id="kc-update-profile-form" className={cx(kcProps.kcFormClass)} action={url.loginAction} method="post">
+                    <UserProfileFormFields kcContext={kcContext} onIsFormSubmittableValueChange={setIsFomSubmittable} i18n={i18n} {...kcProps} />
+
+                    <div className={cx(kcProps.kcFormGroupClass)}>
+                        <div id="kc-form-options" className={cx(kcProps.kcFormOptionsClass)}>
+                            <div className={cx(kcProps.kcFormOptionsWrapperClass)}></div>
                         </div>
-                    </form>
-                }
-            />
-        );
-    }
-);
+
+                        <div id="kc-form-buttons" className={cx(kcProps.kcFormButtonsClass)}>
+                            {isAppInitiatedAction ? (
+                                <>
+                                    <input
+                                        className={cx(kcProps.kcButtonClass, kcProps.kcButtonPrimaryClass, kcProps.kcButtonLargeClass)}
+                                        type="submit"
+                                        value={msgStr("doSubmit")}
+                                    />
+                                    <button
+                                        className={cx(kcProps.kcButtonClass, kcProps.kcButtonDefaultClass, kcProps.kcButtonLargeClass)}
+                                        type="submit"
+                                        name="cancel-aia"
+                                        value="true"
+                                        formNoValidate
+                                    >
+                                        {msg("doCancel")}
+                                    </button>
+                                </>
+                            ) : (
+                                <input
+                                    className={cx(
+                                        kcProps.kcButtonClass,
+                                        kcProps.kcButtonPrimaryClass,
+                                        kcProps.kcButtonBlockClass,
+                                        kcProps.kcButtonLargeClass
+                                    )}
+                                    type="submit"
+                                    defaultValue={msgStr("doSubmit")}
+                                    disabled={!isFomSubmittable}
+                                />
+                            )}
+                        </div>
+                    </div>
+                </form>
+            }
+        />
+    );
+});
 
 export default UpdateUserProfile;
diff --git a/src/lib/components/WebauthnAuthenticate.tsx b/src/lib/components/WebauthnAuthenticate.tsx
index 08d7ea3d..9e41fd37 100644
--- a/src/lib/components/WebauthnAuthenticate.tsx
+++ b/src/lib/components/WebauthnAuthenticate.tsx
@@ -1,5 +1,6 @@
 import React, { useRef, useState, memo } from "react";
-import Template from "./Template";
+import DefaultTemplate from "./Template";
+import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
 import { useCssAndCx } from "../tools/useCssAndCx";
@@ -7,198 +8,198 @@ import type { I18n, MessageKeyBase } from "../i18n";
 import { base64url } from "rfc4648";
 import { useConstCallback } from "powerhooks/useConstCallback";
 
-const WebauthnAuthenticate = memo(
-    ({
-        kcContext,
-        i18n,
-        doFetchDefaultThemeResources = true,
-        ...props
-    }: { kcContext: KcContextBase.WebauthnAuthenticate; i18n: I18n; doFetchDefaultThemeResources?: boolean } & KcProps) => {
-        const { url } = kcContext;
+export type WebauthnAuthenticateProps = KcProps & {
+    kcContext: KcContextBase.WebauthnAuthenticate;
+    i18n: I18n;
+    doFetchDefaultThemeResources?: boolean;
+    Template?: (props: TemplateProps) => JSX.Element | null;
+};
 
-        const { msg, msgStr } = i18n;
+const WebauthnAuthenticate = memo((props: WebauthnAuthenticateProps) => {
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
 
-        const { authenticators, challenge, shouldDisplayAuthenticators, userVerification, rpId } = kcContext;
-        const createTimeout = Number(kcContext.createTimeout);
-        const isUserIdentified = kcContext.isUserIdentified == "true";
+    const { url } = kcContext;
 
-        const { cx } = useCssAndCx();
+    const { msg, msgStr } = i18n;
 
-        const webAuthnAuthenticate = useConstCallback(async () => {
-            if (!isUserIdentified) {
-                return;
-            }
-            const allowCredentials = authenticators.authenticators.map(
-                authenticator =>
-                    ({
-                        id: base64url.parse(authenticator.credentialId, { loose: true }),
-                        type: "public-key"
-                    } as PublicKeyCredentialDescriptor)
-            );
-            // Check if WebAuthn is supported by this browser
-            if (!window.PublicKeyCredential) {
-                setError(msgStr("webauthn-unsupported-browser-text"));
-                submitForm();
-                return;
-            }
+    const { authenticators, challenge, shouldDisplayAuthenticators, userVerification, rpId } = kcContext;
+    const createTimeout = Number(kcContext.createTimeout);
+    const isUserIdentified = kcContext.isUserIdentified == "true";
 
-            const publicKey: PublicKeyCredentialRequestOptions = {
-                rpId,
-                challenge: base64url.parse(challenge, { loose: true })
-            };
+    const { cx } = useCssAndCx();
 
-            if (createTimeout !== 0) {
-                publicKey.timeout = createTimeout * 1000;
-            }
+    const webAuthnAuthenticate = useConstCallback(async () => {
+        if (!isUserIdentified) {
+            return;
+        }
+        const allowCredentials = authenticators.authenticators.map(
+            authenticator =>
+                ({
+                    id: base64url.parse(authenticator.credentialId, { loose: true }),
+                    type: "public-key"
+                } as PublicKeyCredentialDescriptor)
+        );
+        // Check if WebAuthn is supported by this browser
+        if (!window.PublicKeyCredential) {
+            setError(msgStr("webauthn-unsupported-browser-text"));
+            submitForm();
+            return;
+        }
 
-            if (allowCredentials.length) {
-                publicKey.allowCredentials = allowCredentials;
-            }
+        const publicKey: PublicKeyCredentialRequestOptions = {
+            rpId,
+            challenge: base64url.parse(challenge, { loose: true })
+        };
 
-            if (userVerification !== "not specified") {
-                publicKey.userVerification = userVerification;
-            }
+        if (createTimeout !== 0) {
+            publicKey.timeout = createTimeout * 1000;
+        }
 
-            try {
-                const resultRaw = await navigator.credentials.get({ publicKey });
-                if (!resultRaw || resultRaw.type != "public-key") return;
-                const result = resultRaw as PublicKeyCredential;
-                if (!("authenticatorData" in result.response)) return;
-                const response = result.response as AuthenticatorAssertionResponse;
-                const clientDataJSON = response.clientDataJSON;
-                const authenticatorData = response.authenticatorData;
-                const signature = response.signature;
+        if (allowCredentials.length) {
+            publicKey.allowCredentials = allowCredentials;
+        }
 
-                setClientDataJSON(base64url.stringify(new Uint8Array(clientDataJSON), { pad: false }));
-                setAuthenticatorData(base64url.stringify(new Uint8Array(authenticatorData), { pad: false }));
-                setSignature(base64url.stringify(new Uint8Array(signature), { pad: false }));
-                setCredentialId(result.id);
-                setUserHandle(base64url.stringify(new Uint8Array(response.userHandle!), { pad: false }));
-                submitForm();
-            } catch (err) {
-                setError(String(err));
-                submitForm();
-            }
-        });
+        if (userVerification !== "not specified") {
+            publicKey.userVerification = userVerification;
+        }
 
-        const webAuthForm = useRef<HTMLFormElement>(null);
-        const submitForm = useConstCallback(() => {
-            webAuthForm.current!.submit();
-        });
+        try {
+            const resultRaw = await navigator.credentials.get({ publicKey });
+            if (!resultRaw || resultRaw.type != "public-key") return;
+            const result = resultRaw as PublicKeyCredential;
+            if (!("authenticatorData" in result.response)) return;
+            const response = result.response as AuthenticatorAssertionResponse;
+            const clientDataJSON = response.clientDataJSON;
+            const authenticatorData = response.authenticatorData;
+            const signature = response.signature;
 
-        const [clientDataJSON, setClientDataJSON] = useState("");
-        const [authenticatorData, setAuthenticatorData] = useState("");
-        const [signature, setSignature] = useState("");
-        const [credentialId, setCredentialId] = useState("");
-        const [userHandle, setUserHandle] = useState("");
-        const [error, setError] = useState("");
+            setClientDataJSON(base64url.stringify(new Uint8Array(clientDataJSON), { pad: false }));
+            setAuthenticatorData(base64url.stringify(new Uint8Array(authenticatorData), { pad: false }));
+            setSignature(base64url.stringify(new Uint8Array(signature), { pad: false }));
+            setCredentialId(result.id);
+            setUserHandle(base64url.stringify(new Uint8Array(response.userHandle!), { pad: false }));
+            submitForm();
+        } catch (err) {
+            setError(String(err));
+            submitForm();
+        }
+    });
 
-        return (
-            <Template
-                {...{ kcContext, i18n, doFetchDefaultThemeResources, ...props }}
-                headerNode={msg("webauthn-login-title")}
-                formNode={
-                    <div id="kc-form-webauthn" className={cx(props.kcFormClass)}>
-                        <form id="webauth" action={url.loginAction} ref={webAuthForm} method="post">
-                            <input type="hidden" id="clientDataJSON" name="clientDataJSON" value={clientDataJSON} />
-                            <input type="hidden" id="authenticatorData" name="authenticatorData" value={authenticatorData} />
-                            <input type="hidden" id="signature" name="signature" value={signature} />
-                            <input type="hidden" id="credentialId" name="credentialId" value={credentialId} />
-                            <input type="hidden" id="userHandle" name="userHandle" value={userHandle} />
-                            <input type="hidden" id="error" name="error" value={error} />
-                        </form>
-                        <div className={cx(props.kcFormGroupClass)}>
-                            {authenticators &&
-                                (() => (
-                                    <form id="authn_select" className={cx(props.kcFormClass)}>
-                                        {authenticators.authenticators.map(authenticator => (
-                                            <input
-                                                type="hidden"
-                                                name="authn_use_chk"
-                                                value={authenticator.credentialId}
-                                                key={authenticator.credentialId}
-                                            />
-                                        ))}
-                                    </form>
-                                ))()}
-                            {authenticators &&
-                                shouldDisplayAuthenticators &&
-                                (() => (
-                                    <>
-                                        {authenticators.authenticators.length > 1 && (
-                                            <p className={cx(props.kcSelectAuthListItemTitle)}>{msg("webauthn-available-authenticators")}</p>
-                                        )}
-                                        <div className={cx(props.kcFormClass)}>
-                                            {authenticators.authenticators.map(authenticator => (
-                                                <div id="kc-webauthn-authenticator" className={cx(props.kcSelectAuthListItemClass)}>
-                                                    <div className={cx(props.kcSelectAuthListItemIconClass)}>
-                                                        <i
-                                                            className={cx(
-                                                                props[authenticator.transports.iconClass] ?? props.kcWebAuthnDefaultIcon,
-                                                                props.kcSelectAuthListItemIconPropertyClass
-                                                            )}
-                                                        />
-                                                    </div>
-                                                    <div className={cx(props.kcSelectAuthListItemBodyClass)}>
-                                                        <div
-                                                            id="kc-webauthn-authenticator-label"
-                                                            className={cx(props.kcSelectAuthListItemHeadingClass)}
-                                                        >
-                                                            {authenticator.label}
-                                                        </div>
+    const webAuthForm = useRef<HTMLFormElement>(null);
+    const submitForm = useConstCallback(() => {
+        webAuthForm.current!.submit();
+    });
 
-                                                        {authenticator.transports && authenticator.transports.displayNameProperties.length && (
-                                                            <div
-                                                                id="kc-webauthn-authenticator-transport"
-                                                                className={cx(props.kcSelectAuthListItemDescriptionClass)}
-                                                            >
-                                                                {authenticator.transports.displayNameProperties.map(
-                                                                    (transport: MessageKeyBase, index: number) => (
-                                                                        <>
-                                                                            <span>{msg(transport)}</span>
-                                                                            {index < authenticator.transports.displayNameProperties.length - 1 && (
-                                                                                <span>{", "}</span>
-                                                                            )}
-                                                                        </>
-                                                                    )
-                                                                )}
-                                                            </div>
-                                                        )}
+    const [clientDataJSON, setClientDataJSON] = useState("");
+    const [authenticatorData, setAuthenticatorData] = useState("");
+    const [signature, setSignature] = useState("");
+    const [credentialId, setCredentialId] = useState("");
+    const [userHandle, setUserHandle] = useState("");
+    const [error, setError] = useState("");
 
-                                                        <div className={cx(props.kcSelectAuthListItemDescriptionClass)}>
-                                                            <span id="kc-webauthn-authenticator-created-label">
-                                                                {msg("webauthn-createdAt-label")}
-                                                            </span>
-                                                            <span id="kc-webauthn-authenticator-created">{authenticator.createdAt}</span>
-                                                        </div>
-                                                    </div>
-                                                    <div className={cx(props.kcSelectAuthListItemFillClass)} />
-                                                </div>
-                                            ))}
-                                        </div>
-                                    </>
-                                ))()}
-                            <div id="kc-form-buttons" className={cx(props.kcFormButtonsClass)}>
-                                <input
-                                    id="authenticateWebAuthnButton"
-                                    type="button"
-                                    onClick={webAuthnAuthenticate}
-                                    autoFocus={true}
-                                    value={msgStr("webauthn-doAuthenticate")}
-                                    className={cx(
-                                        props.kcButtonClass,
-                                        props.kcButtonPrimaryClass,
-                                        props.kcButtonBlockClass,
-                                        props.kcButtonLargeClass
+    return (
+        <Template
+            {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
+            headerNode={msg("webauthn-login-title")}
+            formNode={
+                <div id="kc-form-webauthn" className={cx(kcProps.kcFormClass)}>
+                    <form id="webauth" action={url.loginAction} ref={webAuthForm} method="post">
+                        <input type="hidden" id="clientDataJSON" name="clientDataJSON" value={clientDataJSON} />
+                        <input type="hidden" id="authenticatorData" name="authenticatorData" value={authenticatorData} />
+                        <input type="hidden" id="signature" name="signature" value={signature} />
+                        <input type="hidden" id="credentialId" name="credentialId" value={credentialId} />
+                        <input type="hidden" id="userHandle" name="userHandle" value={userHandle} />
+                        <input type="hidden" id="error" name="error" value={error} />
+                    </form>
+                    <div className={cx(kcProps.kcFormGroupClass)}>
+                        {authenticators &&
+                            (() => (
+                                <form id="authn_select" className={cx(kcProps.kcFormClass)}>
+                                    {authenticators.authenticators.map(authenticator => (
+                                        <input
+                                            type="hidden"
+                                            name="authn_use_chk"
+                                            value={authenticator.credentialId}
+                                            key={authenticator.credentialId}
+                                        />
+                                    ))}
+                                </form>
+                            ))()}
+                        {authenticators &&
+                            shouldDisplayAuthenticators &&
+                            (() => (
+                                <>
+                                    {authenticators.authenticators.length > 1 && (
+                                        <p className={cx(kcProps.kcSelectAuthListItemTitle)}>{msg("webauthn-available-authenticators")}</p>
                                     )}
-                                />
-                            </div>
+                                    <div className={cx(kcProps.kcFormClass)}>
+                                        {authenticators.authenticators.map(authenticator => (
+                                            <div id="kc-webauthn-authenticator" className={cx(kcProps.kcSelectAuthListItemClass)}>
+                                                <div className={cx(kcProps.kcSelectAuthListItemIconClass)}>
+                                                    <i
+                                                        className={cx(
+                                                            kcProps[authenticator.transports.iconClass] ?? kcProps.kcWebAuthnDefaultIcon,
+                                                            kcProps.kcSelectAuthListItemIconPropertyClass
+                                                        )}
+                                                    />
+                                                </div>
+                                                <div className={cx(kcProps.kcSelectAuthListItemBodyClass)}>
+                                                    <div
+                                                        id="kc-webauthn-authenticator-label"
+                                                        className={cx(kcProps.kcSelectAuthListItemHeadingClass)}
+                                                    >
+                                                        {authenticator.label}
+                                                    </div>
+
+                                                    {authenticator.transports && authenticator.transports.displayNameProperties.length && (
+                                                        <div
+                                                            id="kc-webauthn-authenticator-transport"
+                                                            className={cx(kcProps.kcSelectAuthListItemDescriptionClass)}
+                                                        >
+                                                            {authenticator.transports.displayNameProperties.map(
+                                                                (transport: MessageKeyBase, index: number) => (
+                                                                    <>
+                                                                        <span>{msg(transport)}</span>
+                                                                        {index < authenticator.transports.displayNameProperties.length - 1 && (
+                                                                            <span>{", "}</span>
+                                                                        )}
+                                                                    </>
+                                                                )
+                                                            )}
+                                                        </div>
+                                                    )}
+
+                                                    <div className={cx(kcProps.kcSelectAuthListItemDescriptionClass)}>
+                                                        <span id="kc-webauthn-authenticator-created-label">{msg("webauthn-createdAt-label")}</span>
+                                                        <span id="kc-webauthn-authenticator-created">{authenticator.createdAt}</span>
+                                                    </div>
+                                                </div>
+                                                <div className={cx(kcProps.kcSelectAuthListItemFillClass)} />
+                                            </div>
+                                        ))}
+                                    </div>
+                                </>
+                            ))()}
+                        <div id="kc-form-buttons" className={cx(kcProps.kcFormButtonsClass)}>
+                            <input
+                                id="authenticateWebAuthnButton"
+                                type="button"
+                                onClick={webAuthnAuthenticate}
+                                autoFocus={true}
+                                value={msgStr("webauthn-doAuthenticate")}
+                                className={cx(
+                                    kcProps.kcButtonClass,
+                                    kcProps.kcButtonPrimaryClass,
+                                    kcProps.kcButtonBlockClass,
+                                    kcProps.kcButtonLargeClass
+                                )}
+                            />
                         </div>
                     </div>
-                }
-            />
-        );
-    }
-);
+                </div>
+            }
+        />
+    );
+});
 
 export default WebauthnAuthenticate;