Making sure password is not being reset before sending error msg

Signed-off-by: Eric Poirier <eric@eclipse.org>
diff --git a/eclipse.org-common/classes/users/siteLogin.class.php b/eclipse.org-common/classes/users/siteLogin.class.php
index d9088aa..6dc65b0 100644
--- a/eclipse.org-common/classes/users/siteLogin.class.php
+++ b/eclipse.org-common/classes/users/siteLogin.class.php
@@ -742,7 +742,10 @@
   }
 
   private function _processSave() {
-    if ($this->password_expired === TRUE) {
+
+    // Check IF the password is expired
+    // AND if the user is NOT trying to change the password
+    if ($this->password_expired === TRUE && (empty($this->password1) && empty($this->password2))) {
       $this->messages['password_expired']['danger'][] = "You need to set a new password before you can update your Account Settings.";
       $this->getVariables("welcomeback");
       return FALSE;