diff --git a/application/forms/Account/ChangePasswordForm.php b/application/forms/Account/ChangePasswordForm.php
index a21f41adb..3c4437ef5 100644
--- a/application/forms/Account/ChangePasswordForm.php
+++ b/application/forms/Account/ChangePasswordForm.php
@@ -63,8 +63,7 @@ class ChangePasswordForm extends Form
             array(
                 'label'         => $this->translate('New Password'),
                 'required'      => true,
-                'validators' => $passwordPolicyObject !== null ?
-                        [new PasswordValidator($passwordPolicyObject)] : [],
+                'validators' => [new PasswordValidator($passwordPolicyObject)]
             )
         );
         $this->addElement(
diff --git a/application/forms/Config/User/UserForm.php b/application/forms/Config/User/UserForm.php
index 19a778f70..5da7583f9 100644
--- a/application/forms/Config/User/UserForm.php
+++ b/application/forms/Config/User/UserForm.php
@@ -55,8 +55,7 @@ class UserForm extends RepositoryForm
             array(
                 'required'  => true,
                 'label'     => $this->translate('Password'),
-                'validators' => $passwordPolicyObject !== null ?
-                        [new PasswordValidator($passwordPolicyObject)] : [],
+                'validators' => [new PasswordValidator($passwordPolicyObject)]
             )
         );