diff --git a/entity/Employee_entity/entityfields/password/onValidation.js b/entity/Employee_entity/entityfields/password/onValidation.js
index 09a14932469fb8e53ec6ba0c44da6a783189b00b..c633cac88f277ec6c4c16e0ab7711e93e8544112 100644
--- a/entity/Employee_entity/entityfields/password/onValidation.js
+++ b/entity/Employee_entity/entityfields/password/onValidation.js
@@ -8,11 +8,11 @@ import("system.vars");
 if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) {
     
     let newPassword = vars.get("$local.value");
-    let policyMessages = tools.validatePasswordPolicies(newPassword);
+    let policyMessages = tools.validatePasswordPolicies(newPassword, "");
     let messages = [];
 
     if(newPassword) {
-        if(Object.keys(policyMessages).length > 0) {
+        if(policyMessages.length > 0) {
             for(let msg in policyMessages) {
                 messages.push(policyMessages[msg]);
             }
diff --git a/entity/Usersettings_entity/entityfields/jpassword/onValidation.js b/entity/Usersettings_entity/entityfields/jpassword/onValidation.js
index 8afe8f4de4218ab1390dec38d38468f995b364d4..ee0296a725fe140338488c7f23def49e18666a81 100644
--- a/entity/Usersettings_entity/entityfields/jpassword/onValidation.js
+++ b/entity/Usersettings_entity/entityfields/jpassword/onValidation.js
@@ -6,7 +6,7 @@ import("system.vars");
 
 let newPassword = vars.get("$local.value");
 let currentPassword = vars.get("$field.currentPassword");
-let policyMessages = tools.validatePasswordPolicies(newPassword);
+let policyMessages = tools.validatePasswordPolicies(newPassword, vars.get("$sys.user"));
 let messages = [];
 
 if(newPassword) {
@@ -14,7 +14,7 @@ if(newPassword) {
         result.string(translate.text("New password must not be the same as the current password"));
     }
     
-    if(Object.keys(policyMessages).length > 0) {
+    if(policyMessages.length > 0) {
         for(let msg in policyMessages) {
             messages.push(policyMessages[msg]);
         }