diff --git a/modules/eeuser/src/main/java/org/jpos/ee/UserManager.java b/modules/eeuser/src/main/java/org/jpos/ee/UserManager.java
index 1ea0058f70..ebfcb214bd 100644
--- a/modules/eeuser/src/main/java/org/jpos/ee/UserManager.java
+++ b/modules/eeuser/src/main/java/org/jpos/ee/UserManager.java
@@ -21,6 +21,7 @@
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
+import java.util.Date;
 import java.util.List;
 
 import org.bouncycastle.util.Arrays;
@@ -70,6 +71,8 @@ public void setPassword (User u, String clearpass, User author, VERSION v) throw
                 setV1Password (u, clearpass);
                 break;
         }
+        u.setPasswordChanged(new Date());
+        u.setForcePasswordChange(false);
         RevisionManager revmgr = new RevisionManager(db);
         if (author == null)
             author = u;