diff --git a/login/change_password.php b/login/change_password.php
index 5a2157ec5cb..e8af953d1d7 100644
--- a/login/change_password.php
+++ b/login/change_password.php
@@ -140,6 +140,10 @@
  *****************************************************************************/
 function validate_form($frm, &$err) {
 
+    // we always need to call this because it handles the
+    // loading of the auth libraries, and we need that for later.
+    $validatepw = authenticate_user_login($frm->username, $frm->password);
+
     if (empty($frm->username)){
         $err->username = get_string('missingusername');
     } else {
@@ -148,7 +152,7 @@ function validate_form($frm, &$err) {
         } else {  
             if (!isadmin()) {
                 //require non adminusers to give valid password
-                if(!authenticate_user_login($frm->username, $frm->password)) {
+                if(!$validatepw) {
                     $err->password = get_string('wrongpassword');
                 }
             }