diff --git a/ispconfig3_pass/ispconfig3_pass.php b/ispconfig3_pass/ispconfig3_pass.php
index 04f154c..99d73d2 100644
--- a/ispconfig3_pass/ispconfig3_pass.php
+++ b/ispconfig3_pass/ispconfig3_pass.php
@@ -188,6 +188,26 @@ function gen_form()
         $table->add('', $input_confpasswd->show());
 
         $out .= $table->show();
+        $out .= '<p>' . $this->gettext('passwordrequirements') . '</p>' . "\n";
+
+        $pwl = $this->rcmail_inst->config->get('password_min_length');
+        $checkUpper = $this->rcmail_inst->config->get('password_check_upper');
+        $checkLower = $this->rcmail_inst->config->get('password_check_lower');
+        $checkSymbol = $this->rcmail_inst->config->get('password_check_symbol');
+        $checkNumber = $this->rcmail_inst->config->get('password_check_number');
+
+        $out .= '<ul>';
+        $out .= '<li>' . str_replace("%d", $pwl, $this->gettext('passwordminlength')) . '</li>';
+        if($checkUpper)
+            $out .= '<li>' . $this->gettext('passwordchecknumber') . '</li>';
+        if($checkLower)
+            $out .= '<li>' . $this->gettext('passwordchecklower') . '</li>';
+        if($checkSymbol)
+            $out .= '<li>' . $this->gettext('passwordcheckupper') . '</li>';
+        if($checkNumber)
+            $out .= '<li>' . $this->gettext('passwordchecksymbol') . '</li>';
+        $out .= '</ul>';
+
         $out .= "</fieldset>\n";
 
         return $out;
diff --git a/ispconfig3_pass/localization/en_US.inc b/ispconfig3_pass/localization/en_US.inc
index 8622797..484aca0 100644
--- a/ispconfig3_pass/localization/en_US.inc
+++ b/ispconfig3_pass/localization/en_US.inc
@@ -11,9 +11,11 @@ $messages['nopassword'] = 'Please input new password.';
 $messages['nocurpassword'] = 'Please input current password.';
 $messages['passwordincorrect'] = 'Current password is incorrect.';
 $messages['passwordinconsistency'] = 'Inconsistency of password, please try again.';
-$messages['passwordminlength'] = 'Password is too short: %d digits required.';
+$messages['passwordminlength'] = 'Password must have at least %d caracters';
 $messages['passwordchecknumber'] = 'Password must include at least one number.';
 $messages['passwordchecklower'] = 'Password must include at least one lower case letter.';
 $messages['passwordcheckupper'] = 'Password must include at least one upper case letter.';
 $messages['passwordchecksymbol'] = 'Password must include at least one symbol.';
+
+$messages['passwordrequirements'] = 'Requirements : ';
 ?>
\ No newline at end of file
diff --git a/ispconfig3_pass/localization/fr_FR.inc b/ispconfig3_pass/localization/fr_FR.inc
index 9d2a234..19dd00e 100644
--- a/ispconfig3_pass/localization/fr_FR.inc
+++ b/ispconfig3_pass/localization/fr_FR.inc
@@ -11,5 +11,11 @@ $messages['nopassword'] = 'Merci de saisir le nouveau mot de passe.';
 $messages['nocurpassword'] = 'Merci de saisir votre mot de passe actuel.';
 $messages['passwordincorrect'] = 'Le mot de passe actuel est incorrect.';
 $messages['passwordinconsistency'] = 'Les mots de passe ne sont pas identiques, veuillez réessayer';
-$messages['passwordminlength'] = 'Le mot de passe est trop court: %d caractères requis.';
+$messages['passwordminlength'] = 'Le mot de passe doit contenir au moins %d caractères.';
+$messages['passwordchecknumber'] = 'Le mot de passe doit inclure au moins un nombre.';
+$messages['passwordchecklower'] = 'Le mot de passe doit inclure au moins une minuscule.';
+$messages['passwordcheckupper'] = 'Le mot de passe doit inclure au moins une majuscule';
+$messages['passwordchecksymbol'] = 'Le mot de passe doit inclure au moins un caractère spécial (?,!,$,-,etc).';
+
+$messages['passwordrequirements'] = 'Contraintes : ';
 ?>
\ No newline at end of file