diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php
index 6445987a..652d4ff5 100644
--- a/includes/pages/admin_user.php
+++ b/includes/pages/admin_user.php
@@ -153,14 +153,17 @@ function admin_user()
 
         $html .= '<hr>';
 
-        $html .= form_info('', __('Please visit the angeltypes page or the users profile to manage the users angeltypes.'));
+        $html .= __('Here you can reset the password of this angel:');
 
-        $html .= ' ' . __('Here you can reset the password of this angel:') . '<form action="'
+        $html .= '<form action="'
             . url('/admin-user', ['action' => 'change_pw', 'id' => $user_id])
             . '" method="post">' . "\n";
         $html .= form_csrf();
         $html .= '<table>' . "\n";
-        $html .= '  <tr><td>' . __('settings.password') . '</td><td>'
+        $html .= '  <tr><td>' . __('settings.password')
+            . ' <span class="bi bi-info-circle-fill text-info" data-bs-toggle="tooltip" title="'
+            . __('password.minimal_length', [config('min_password_length')]) . '"></span>'
+            . '</td><td>'
             . '<input type="password" size="40" name="new_pw" value="" class="form-control" autocomplete="new-password">'
             . '</td></tr>' . "\n";
         $html .= '  <tr><td>' . __('password.reset.confirm') . '</td><td>'
diff --git a/resources/lang/de_DE/default.po b/resources/lang/de_DE/default.po
index a784c052..559a2d7d 100644
--- a/resources/lang/de_DE/default.po
+++ b/resources/lang/de_DE/default.po
@@ -156,6 +156,9 @@ msgstr ""
 "zurücksetzen kannst. Bitte benutze die E-Mail-Adresse, die du bei der Anmeldung "
 "verwendet hast."
 
+msgid "password.minimal_length"
+msgstr "Mindestlänge %d Zeichen"
+
 msgid "form.recover"
 msgstr "Wiederherstellen"
 
@@ -1317,9 +1320,6 @@ msgstr ""
 "Ist der Engel Aktiv, hat er damit Anspruch auf ein T-Shirt. Wenn T-Shirt ein 'Ja' enthält, bedeutet dies, "
 "dass der Engel bereits sein T-Shirt erhalten hat."
 
-msgid "Please visit the angeltypes page or the users profile to manage the users angeltypes."
-msgstr "Bitte besuche die Seite Engeltypen oder das Benutzerprofil, um die Engeltypen des Benutzers zu verwalten."
-
 msgid "Here you can reset the password of this angel:"
 msgstr "Hier kannst du das Passwort für diesen Engel zurücksetzen:"
 
diff --git a/resources/lang/en_US/default.po b/resources/lang/en_US/default.po
index 38a13f19..828e88d4 100644
--- a/resources/lang/en_US/default.po
+++ b/resources/lang/en_US/default.po
@@ -746,6 +746,9 @@ msgstr ""
 msgid "password.email.message"
 msgstr "Please visit %s to recover your password."
 
+msgid "password.minimal_length"
+msgstr "Minimal length %d characters"
+
 msgid "footer.eventinfo.name_start_end"
 msgstr "%1$s, from %2$s to %3$s"
 
diff --git a/resources/views/pages/password/reset-form.twig b/resources/views/pages/password/reset-form.twig
index 06b33a85..85d4ee0c 100644
--- a/resources/views/pages/password/reset-form.twig
+++ b/resources/views/pages/password/reset-form.twig
@@ -11,6 +11,7 @@
                 'type': 'password',
                 'min_length': min_length,
                 'required': true,
+                'info': __('password.minimal_length', [config('min_password_length')]),
             }) }}
             {{ f.input('password_confirmation', __('password.reset.confirm'), {
                 'type': 'password',
diff --git a/resources/views/pages/registration.twig b/resources/views/pages/registration.twig
index 21441990..416e3bcf 100644
--- a/resources/views/pages/registration.twig
+++ b/resources/views/pages/registration.twig
@@ -68,6 +68,8 @@
                                 'autocomplete': 'new-password',
                                 'required': true,
                                 'required_icon': true,
+                                'min_length': minPasswordLength,
+                                'info': __('password.minimal_length', [minPasswordLength]),
                             }
                         ) }}
                     </div>
@@ -80,6 +82,7 @@
                                 'autocomplete': 'new-password',
                                 'required': true,
                                 'required_icon': true,
+                                'min_length': minPasswordLength,
                             }
                         ) }}
                     </div>
diff --git a/resources/views/pages/settings/password.twig b/resources/views/pages/settings/password.twig
index 833742e1..00bf6063 100644
--- a/resources/views/pages/settings/password.twig
+++ b/resources/views/pages/settings/password.twig
@@ -24,6 +24,7 @@
                     'min_length': min_length,
                     'required': true,
                     'autocomplete': 'new-password',
+                    'info': __('password.minimal_length', [min_length]),
                 }) }}
                 {{ f.input('new_password2', __('settings.password.new_password2'), {
                     'type': 'password',
diff --git a/src/Controllers/RegistrationController.php b/src/Controllers/RegistrationController.php
index 44f1a81c..7c0df8b7 100644
--- a/src/Controllers/RegistrationController.php
+++ b/src/Controllers/RegistrationController.php
@@ -89,6 +89,7 @@ class RegistrationController extends BaseController
         return $this->response->withView(
             'pages/registration',
             [
+                'minPasswordLength' => $this->config->get('min_password_length'),
                 'tShirtSizes' => $this->config->get('tshirt_sizes'),
                 'angelTypes' => AngelType::whereHideRegister(false)->get(),
                 'preselectedAngelTypes' => $preselectedAngelTypes,