diff --git a/org.adempiere.base/src/org/compiere/model/MUser.java b/org.adempiere.base/src/org/compiere/model/MUser.java
index e4fbf1fb01..fc1518a3d4 100644
--- a/org.adempiere.base/src/org/compiere/model/MUser.java
+++ b/org.adempiere.base/src/org/compiere/model/MUser.java
@@ -926,7 +926,7 @@ public class MUser extends X_AD_User
 			}
 		}
 			
-		if (newRecord || is_ValueChanged("Password")) {
+		if (getPassword() != null && getPassword().length() > 0 && (newRecord || is_ValueChanged("Password"))) {
 			// Validate password policies / IDEMPIERE-221
 			if (get_ValueOld("Salt") == null && get_Value("Salt") != null) { // being hashed
 				;