diff --git a/UI/MainUI/SOGoRootPage.m b/UI/MainUI/SOGoRootPage.m
index a9a5b6271..9d66825fb 100644
--- a/UI/MainUI/SOGoRootPage.m
+++ b/UI/MainUI/SOGoRootPage.m
@@ -153,7 +153,7 @@
   
   if ((b = [auth checkLogin: username password: password
 		 perr: &err expire: &expire grace: &grace])
-      && (err == PolicyNoError || err == PolicyChangeAfterReset))
+      && (err == PolicyNoError))
     {
       [self logWithFormat: @"successful login for user '%@'", username];
       response = [self responseWith204];
diff --git a/UI/WebServerResources/SOGoRootPage.js b/UI/WebServerResources/SOGoRootPage.js
index e1af5b2c5..27f888121 100644
--- a/UI/WebServerResources/SOGoRootPage.js
+++ b/UI/WebServerResources/SOGoRootPage.js
@@ -217,16 +217,16 @@ function passwordDialogOK(event) {
     var field = $("newPassword");
     var confirmationField = $("newPassword2");
     if (field && confirmationField) {
-        var password = field.value;
-        if (password == confirmationField.value) {
-            if (password.length > 0) {
+        var newPassword = field.value;
+        if (newPassword == confirmationField.value) {
+            if (newPassword.length > 0) {
                 var userName = $("userName");
                 var password = $("password");
                 var policy = new PasswordPolicy(userName.value,
                                                 password.value);
                 policy.setCallbacks(onPasswordChangeSuccess,
                                     onPasswordChangeFailure);
-                policy.changePassword(password);
+                policy.changePassword(newPassword);
             }
             else
                 SetLogMessage("passwordError",
@@ -247,7 +247,7 @@ function onPasswordChangeSuccess() {
     redirectToUserPage();
 }
 
-function onPasswordChangeFailre(code, message) {
+function onPasswordChangeFailure(code, message) {
     SetLogMessage("passwordError", message);
 }