diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
index c38c55fcfb..aa037b7431 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
@@ -79,7 +79,7 @@
         }
 
         $scope.loginSubmit = function (login, password) {
-
+            
             //if the login and password are not empty we need to automatically 
             // validate them - this is because if there are validation errors on the server
             // then the user has to change both username & password to resubmit which isn't ideal,
@@ -121,13 +121,18 @@
 
         $scope.requestPasswordResetSubmit = function (email) {
 
-            $scope.errorMsg = "";
+            if (email && email.length > 0) {
+                $scope.requestPasswordResetForm.email.$setValidity('auth', true);
+            }
+            
             $scope.showEmailResetConfirmation = false;
 
             if ($scope.requestPasswordResetForm.$invalid) {
                 return;
             }
 
+            $scope.errorMsg = "";
+
             authResource.performRequestPasswordReset(email)
                 .then(function () {
                     //remove the email entered
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
index 12f25f42a5..5933848c36 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
@@ -25,7 +25,7 @@
                                     id="{{login.authType}}" name="provider" value="{{login.authType}}"
                                     title="Log in using your {{login.caption}} account">
                                 <i class="fa" ng-class="login.properties.SocialIcon"></i>
-                                Sign in with {{login.caption}}
+                                <localize key="login_signInWith">Sign in with</localize> {{login.caption}}
                             </button>
 
                         </div>
@@ -33,7 +33,7 @@
 
                     <div id="hrOr">
                         <hr />
-                        <div>Or</div>
+                        <div><localize key="general_or">or</localize></div>
                     </div>
 
                 </div>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
index 602f66ddf4..511e9ad9f8 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
@@ -530,6 +530,7 @@
     <key alias="greeting5">Endelig fredag!</key>
     <key alias="greeting6">Gledelig lørdag</key>
     <key alias="instruction">Logg på nedenfor</key>
+    <key alias="signInWith">Logg på med</key>
     <key alias="timeout">Din sesjon er utløpt</key>
     <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
   </area>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index 17d9bedcd1..6bdb5631d4 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -617,6 +617,7 @@
     <key alias="greeting6">Glædelig lørdag</key>
     <key alias="instruction">Log ind nedenfor</key>
     <key alias="instruction">indtast brugernavn og kodeord</key>
+    <key alias="signInWith">Log ind med</key>
     <key alias="timeout">Din session er udløbet</key>
     <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">umbraco.com</a></p> ]]></key>
     <key alias="forgottenPassword">Glemt adgangskode?</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
index d7f2c320b9..ed7f1e07a2 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
@@ -565,6 +565,7 @@ Wenn Sie sich für Runway entscheiden, können Sie optional Blöcke nutzen, die
     <key alias="greeting5">Frohen freundlichen Freitag</key>
     <key alias="greeting6">Wunderbaren sonnigen Samstag</key>
     <key alias="instruction">Hier anmelden:</key>
+    <key alias="signInWith">Anmelden mit</key>
     <key alias="timeout">Sitzung abgelaufen</key>
     <key alias="bottomText">&lt;p style="text-align:right;"&gt;&amp;copy; 2001 - %0% &lt;br /&gt;&lt;a href="http://umbraco.com" style="text-decoration: none" target="_blank"&gt;umbraco.org&lt;/a&gt;&lt;/p&gt; </key>
   </area>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 2f9871add8..e07feb0549 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -701,6 +701,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="greeting5">Happy funky Friday</key>
     <key alias="greeting6">Happy Caturday</key>
     <key alias="instruction">Log in below</key>
+    <key alias="signInWith">Sign in with</key>
     <key alias="timeout">Session timed out</key>
     <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>
     <key alias="forgottenPassword">Forgotten password?</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index e0022eb2c0..ced38833f9 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -699,6 +699,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="greeting5">Happy funky Friday</key>
     <key alias="greeting6">Happy Caturday</key>
     <key alias="instruction">Log in below</key>
+    <key alias="signInWith">Sign in with</key>
     <key alias="timeout">Session timed out</key>
     <key alias="bottomText"><![CDATA[<p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">Umbraco.com</a></p> ]]></key>
     <key alias="forgottenPassword">Forgotten password?</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
index 10e882f260..259b914a72 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
@@ -520,6 +520,7 @@
     <key alias="greeting5">Happy friendly Friday</key>
     <key alias="greeting6">Happy shiny Saturday</key>
     <key alias="instruction">Logga in nedan</key>
+    <key alias="signInWith">Logga in med</key>
     <key alias="timeout">Sessionen har nått sin maxgräns</key>
   </area>
   <area alias="main">