diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java
index 520784de..33c0b62d 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java
@@ -194,7 +194,7 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
 	        
 	        if(newPassword.equals(confirmPassword)){
 	            if(oldPassword==null || 
-	                    passwordEncoder.matches(oldPassword, changeUserInfo.getPassword())){
+	                    passwordEncoder.matches(oldPassword, userInfo.getPassword())){
 	                if(changePassword(changeUserInfo) ){
 	                    userInfo.setPassword(changeUserInfo.getPassword());
                         userInfo.setDecipherable(changeUserInfo.getDecipherable());