keycloak-aplcache

diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/login.ftl b/forms/src/main/resources/META-INF/resources/forms/theme/default/login.ftl
index 24c4cce..863118e 100755
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/login.ftl
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/login.ftl
@@ -24,6 +24,7 @@
             </#list>
 
             <div class="aside-btn">
+                <p>Forgot <a href="${url.passwordResetUrl}">Password</a>?</p>
             </div>
 
             <input class="btn-primary" type="submit" value="Log In"/>
@@ -36,8 +37,6 @@
         <#if realm.registrationAllowed>
             <p>${rb.getString('noAccount')} <a href="${url.registrationUrl}">${rb.getString('register')}</a>.</p>
         </#if>
-        
-        <a href="${url.passwordResetUrl}">Reset password</a>
     </div>
 
     </#if>

diff --git a/forms/src/main/resources/org/keycloak/forms/messages.properties b/forms/src/main/resources/org/keycloak/forms/messages.properties
index 4ce9a69..ce6667a 100644
--- a/forms/src/main/resources/org/keycloak/forms/messages.properties
+++ b/forms/src/main/resources/org/keycloak/forms/messages.properties
@@ -1,7 +1,7 @@
 logIn=Log in
 logInTo=Log in to
 logInWith=Log in with
-noAccount=No account?
+noAccount=New user?
 register=Register
 registerWith=Register with
 allRequired=All fields are required
@@ -18,7 +18,7 @@ password=Password
 passwordConfirm=Confirm Password
 passwordNew=New Password
 
-authenticatorCode=Authenticator Code
+authenticatorCode=One-time-password
 clientCertificate=Client Certificate
 
 invalidUser=Invalid username or password

diff --git a/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginPage.java b/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginPage.java
index 7abbbdb..1d9c949 100644
--- a/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginPage.java
+++ b/testsuite/src/test/java/org/keycloak/testsuite/pages/LoginPage.java
@@ -47,7 +47,7 @@ public class LoginPage extends Page {
     @FindBy(linkText = "Register")
     private WebElement registerLink;
 
-    @FindBy(linkText = "Reset password")
+    @FindBy(linkText = "Password")
     private WebElement resetPasswordLink;
 
     @FindBy(id = "loginError")