diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChangePasswordPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChangePasswordPanel.java
index 031d65bbb4..82d50d96ac 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChangePasswordPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChangePasswordPanel.java
@@ -37,6 +37,7 @@ import org.compiere.model.MPasswordHistory;
 import org.compiere.model.MPasswordRule;
 import org.compiere.model.MSysConfig;
 import org.compiere.model.MUser;
+import org.compiere.model.PO;
 import org.compiere.util.CLogger;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
@@ -356,7 +357,12 @@ public class ChangePasswordPanel extends Window implements EventListener<Event>
 	    		user.setIsExpired(false);
 	    		user.setSecurityQuestion(securityQuestion);
 	    		user.setAnswer(answer);    		
-	    		user.saveEx(trx.getTrxName());
+	    		try {
+	    			PO.setCrossTenantSafe();
+	    			user.saveEx(trx.getTrxName());
+	    		} finally {
+	    			PO.clearCrossTenantSafe();
+	    		}
 	    	}
 	    	
 	    	trx.commit();