From d20d5ce2d781d84f890c7e3814187bb37f52eae0 Mon Sep 17 00:00:00 2001
From: Christopher Svensson <stoffus@stoffus.com>
Date: Thu, 18 Aug 2016 10:24:37 +0200
Subject: [PATCH] Bug fix: Respect registrationEmailAsUsername in
 reset-password template.

---
 .../main/resources/theme/base/login/login-reset-password.ftl  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 404de17ea2..a561b2a65f 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>