diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AdminLoginController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AdminLoginController.java
index 5f1a6b780..ec5adcd0c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AdminLoginController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AdminLoginController.java
@@ -97,7 +97,7 @@ public class AdminLoginController extends FreemarkerHttpServlet {
 			if (auth.isCurrentPassword(username, password)) {
 				auth.recordLoginAgainstUserAccount(username, INTERNAL);
 
-				if (auth.isPasswordChangeRequired(username)) {
+				if (!newPassword.isEmpty()) {
 					auth.recordNewPassword(username, newPassword);
 				}