diff --git a/application/forms/Account/ChangePasswordForm.php b/application/forms/Account/ChangePasswordForm.php
index 73511e8fa..a21f41adb 100644
--- a/application/forms/Account/ChangePasswordForm.php
+++ b/application/forms/Account/ChangePasswordForm.php
@@ -37,20 +37,16 @@ class ChangePasswordForm extends Form
      */
     public function createElements(array $formData)
     {
-        $passwordPolicyObject = null;
         $passwordPolicy = Config::app()->get(
             'global',
             'password_policy',
             DefaultPasswordPolicy::class
         );
+        $passwordPolicyObject = new $passwordPolicy();
+        $passwordPolicyDescription = $passwordPolicyObject->getDescription();
 
-        if (isset($passwordPolicy)) {
-            $passwordPolicyObject = new $passwordPolicy();
-            $passwordPolicyDescription = $passwordPolicyObject->getDescription();
-
-            if ($passwordPolicyDescription != '') {
-                $this->addDescription($passwordPolicyDescription);
-            }
+        if ($passwordPolicyDescription != '') {
+            $this->addDescription($passwordPolicyDescription);
         }
 
         $this->addElement(
diff --git a/application/forms/Config/User/UserForm.php b/application/forms/Config/User/UserForm.php
index 8d8a591e7..19a778f70 100644
--- a/application/forms/Config/User/UserForm.php
+++ b/application/forms/Config/User/UserForm.php
@@ -20,19 +20,16 @@ class UserForm extends RepositoryForm
      */
     protected function createInsertElements(array $formData)
     {
-        $passwordPolicyObject = null;
         $passwordPolicy = Config::app()->get(
             'global',
             'password_policy',
             DefaultPasswordPolicy::class
         );
-        if (isset($passwordPolicy)) {
-            $passwordPolicyObject = new $passwordPolicy();
-            $passwordPolicyDescription = $passwordPolicyObject->getDescription();
+        $passwordPolicyObject = new $passwordPolicy();
+        $passwordPolicyDescription = $passwordPolicyObject->getDescription();
 
-            if ($passwordPolicyDescription != '') {
-                $this->addDescription($passwordPolicyDescription);
-            }
+        if ($passwordPolicyDescription != '') {
+            $this->addDescription($passwordPolicyDescription);
         }
 
         $this->addElement(