diff --git a/.gitignore b/.gitignore
index ff5bb165e..5ca14cbc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,6 @@ build/*
 # Exclude dompdf font cache
 library/vendor/dompdf/lib/fonts/*.php
 library/vendor/dompdf/lib/fonts/log.htm
+
+#locale änderung für Tests sollen nicht gepushed werden
+composer.json
diff --git a/application/forms/Account/ChangePasswordForm.php b/application/forms/Account/ChangePasswordForm.php
index 3c4437ef5..15986cf6f 100644
--- a/application/forms/Account/ChangePasswordForm.php
+++ b/application/forms/Account/ChangePasswordForm.php
@@ -4,7 +4,8 @@
 namespace Icinga\Forms\Account;
 
 use Icinga\Application\Config;
-use Icinga\Application\ProvidedHook\DefaultPasswordPolicy;
+use Icinga\Application\ProvidedHook\CommonPasswordPolicy;
+use Icinga\Application\ProvidedHook\NoPasswordPolicy;
 use Icinga\Authentication\PasswordValidator;
 use Icinga\Authentication\User\DbUserBackend;
 use Icinga\Data\Filter\Filter;
@@ -40,7 +41,7 @@ class ChangePasswordForm extends Form
         $passwordPolicy = Config::app()->get(
             'global',
             'password_policy',
-            DefaultPasswordPolicy::class
+            NoPasswordPolicy::class
         );
         $passwordPolicyObject = new $passwordPolicy();
         $passwordPolicyDescription = $passwordPolicyObject->getDescription();
diff --git a/application/forms/Config/General/PasswordPolicyConfigForm.php b/application/forms/Config/General/PasswordPolicyConfigForm.php
index d87f08588..ef6ea6164 100644
--- a/application/forms/Config/General/PasswordPolicyConfigForm.php
+++ b/application/forms/Config/General/PasswordPolicyConfigForm.php
@@ -4,7 +4,8 @@
 namespace Icinga\Forms\Config\General;
 
 use Icinga\Application\Hook;
-use Icinga\Application\ProvidedHook\DefaultPasswordPolicy;
+use Icinga\Application\ProvidedHook\CommonPasswordPolicy;
+use Icinga\Application\ProvidedHook\NoPasswordPolicy;
 use Icinga\Web\Form;
 
 /**
@@ -36,7 +37,7 @@ class PasswordPolicyConfigForm extends Form
                     'Enforce strong password requirements for new passwords'
                 ),
                 'label'       => $this->translate('Password Policy'),
-                'value'       => DefaultPasswordPolicy::class,
+                'value'       => NoPasswordPolicy::class,
                 'multiOptions' =>$passwordPolicies
             ]
         );
diff --git a/application/forms/Config/User/UserForm.php b/application/forms/Config/User/UserForm.php
index 5da7583f9..62707a9fc 100644
--- a/application/forms/Config/User/UserForm.php
+++ b/application/forms/Config/User/UserForm.php
@@ -5,7 +5,8 @@ namespace Icinga\Forms\Config\User;
 
 use Icinga\Application\Config;
 use Icinga\Application\Hook\ConfigFormEventsHook;
-use Icinga\Application\ProvidedHook\DefaultPasswordPolicy;
+use Icinga\Application\ProvidedHook\CommonPasswordPolicy;
+use Icinga\Application\ProvidedHook\NoPasswordPolicy;
 use Icinga\Authentication\PasswordValidator;
 use Icinga\Data\Filter\Filter;
 use Icinga\Forms\RepositoryForm;
@@ -23,7 +24,7 @@ class UserForm extends RepositoryForm
         $passwordPolicy = Config::app()->get(
             'global',
             'password_policy',
-            DefaultPasswordPolicy::class
+            NoPasswordPolicy::class
         );
         $passwordPolicyObject = new $passwordPolicy();
         $passwordPolicyDescription = $passwordPolicyObject->getDescription();
diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php
index b290e463a..34668c906 100644
--- a/library/Icinga/Application/ApplicationBootstrap.php
+++ b/library/Icinga/Application/ApplicationBootstrap.php
@@ -7,7 +7,7 @@ use DirectoryIterator;
 use ErrorException;
 use Exception;
 use Icinga\Application\ProvidedHook\DbMigration;
-use Icinga\Application\ProvidedHook\DefaultPasswordPolicy;
+use Icinga\Application\ProvidedHook\CommonPasswordPolicy;
 use Icinga\Application\ProvidedHook\NoPasswordPolicy;
 use ipl\I18n\GettextTranslator;
 use ipl\I18n\StaticTranslator;
@@ -742,7 +742,7 @@ abstract class ApplicationBootstrap
     protected function registerApplicationHooks(): self
     {
         Hook::register('DbMigration', DbMigration::class, DbMigration::class);
-        Hook::register('passwordpolicy', DefaultPasswordPolicy::class, DefaultPasswordPolicy::class);
+        Hook::register('passwordpolicy', CommonPasswordPolicy::class, CommonPasswordPolicy::class);
         Hook::register('passwordpolicy', NoPasswordPolicy::class, NoPasswordPolicy::class);
 
         return $this;
diff --git a/library/Icinga/Application/ProvidedHook/DefaultPasswordPolicy.php b/library/Icinga/Application/ProvidedHook/CommonPasswordPolicy.php
similarity index 92%
rename from library/Icinga/Application/ProvidedHook/DefaultPasswordPolicy.php
rename to library/Icinga/Application/ProvidedHook/CommonPasswordPolicy.php
index 3feb2a99d..a3efc158e 100644
--- a/library/Icinga/Application/ProvidedHook/DefaultPasswordPolicy.php
+++ b/library/Icinga/Application/ProvidedHook/CommonPasswordPolicy.php
@@ -7,7 +7,7 @@ use Icinga\Application\Hook\PasswordPolicyHook;
 use ipl\I18n\Translation;
 
 /**
- * Default implementation of a password policy
+ * Common implementation of a password policy
  *
  * Enforces:
  * - Minimum length of 12 characters
@@ -16,13 +16,13 @@ use ipl\I18n\Translation;
  * - At least one uppercase letter
  * - At least one lowercase letter
  */
-class DefaultPasswordPolicy implements PasswordPolicyHook
+class CommonPasswordPolicy implements PasswordPolicyHook
 {
     use Translation;
 
     public function getName(): string
     {
-        return $this->translate('Default');
+        return $this->translate('Common');
     }
 
     public function getDescription(): string