keycloak-uncached

Merge pull request #3150 from stoffus/bug-fix-in-reset-password-tpl KEYCLOAK-3441

9/5/2016 4:10:49 AM

Details

diff --git a/themes/src/main/resources/theme/base/login/login-reset-password.ftl b/themes/src/main/resources/theme/base/login/login-reset-password.ftl
index 404de17..a561b2a 100755
--- a/themes/src/main/resources/theme/base/login/login-reset-password.ftl
+++ b/themes/src/main/resources/theme/base/login/login-reset-password.ftl
@@ -8,7 +8,7 @@
         <form id="kc-reset-password-form" class="${properties.kcFormClass!}" action="${url.loginAction}" method="post">
             <div class="${properties.kcFormGroupClass!}">
                 <div class="${properties.kcLabelWrapperClass!}">
-                    <label for="username" class="${properties.kcLabelClass!}">${msg("usernameOrEmail")}</label>
+                    <label for="username" class="${properties.kcLabelClass!}"><#if !realm.registrationEmailAsUsername>${msg("usernameOrEmail")}<#else>${msg("email")}</#if></label>
                 </div>
                 <div class="${properties.kcInputWrapperClass!}">
                     <input type="text" id="username" name="username" class="${properties.kcInputClass!}" autofocus/>
@@ -30,4 +30,4 @@
     <#elseif section = "info" >
         ${msg("emailInstruction")}
     </#if>
-</@layout.registrationLayout>
\ No newline at end of file
+</@layout.registrationLayout>