diff --git a/metadata.php b/metadata.php
index ed70c2c5..e2a1a467 100644
--- a/metadata.php
+++ b/metadata.php
@@ -42,8 +42,8 @@
         'en' => 'Password Policy'
     ],
     'description' => [
-        'de' => 'Prüfung der Kennwortstärke, Visualisierung, Abflaufregeln',
-        'en' => 'Password validation, strength visualization and expiry rules',
+        'de' => 'Prüfung der Kennwortstärke, Visualisierung, Abflaufregeln (modified by tabsl / fix guest registration)',
+        'en' => 'Password validation, strength visualization and expiry rules (modified by tabsl / fix guest registration)',
     ],
     'thumbnail' => 'out/pictures/picture.png',
     'version' => '2.0.0',
diff --git a/src/Core/PasswordPolicyValidator.php b/src/Core/PasswordPolicyValidator.php
index e8c5cc1e..2f7f7615 100644
--- a/src/Core/PasswordPolicyValidator.php
+++ b/src/Core/PasswordPolicyValidator.php
@@ -42,9 +42,11 @@ class PasswordPolicyValidator extends PasswordPolicyValidator_parent
      */
     public function checkPassword($user, $newPassword, $confirmationPassword, $shouldCheckPasswordLength = false)
     {
-        $ex = $this->validatePassword($newPassword);
-        if (isset($ex)) {
-            return $ex;
+        if($shouldCheckPasswordLength) {
+            $ex = $this->validatePassword($newPassword);
+            if (isset($ex)) {
+                return $ex;
+            }
         }
         return parent::checkPassword($user, $newPassword, $confirmationPassword, $shouldCheckPasswordLength);
     }