diff --git a/bureau/locales/de_DE/LC_MESSAGES/messages.po b/bureau/locales/de_DE/LC_MESSAGES/messages.po
index 1b4fd6f0..dabc16e1 100644
--- a/bureau/locales/de_DE/LC_MESSAGES/messages.po
+++ b/bureau/locales/de_DE/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: alternc\n"
 "Report-Msgid-Bugs-To: i18n@alternc.org\n"
-"POT-Creation-Date: 2015-05-12 15:54+0200\n"
+"POT-Creation-Date: 2015-06-16 14:09+0200\n"
 "PO-Revision-Date: 2004-02-14 19:53-0400\n"
 "Last-Translator: Bruno Marmier <bruno@marmier.net>\n"
 "Language-Team: Espagnol <i18n@alternc.org>\n"
@@ -230,7 +230,7 @@ msgstr ""
 #: ../admin/adm_domstypeedit.php:134 ../admin/adm_edit.php:124
 #: ../admin/adm_quotaedit.php:88 ../admin/adm_tldadd.php:71
 #: ../admin/adm_tldedit.php:70 ../admin/bro_pref.php:150
-#: ../admin/browseforfolder2.php:149 ../admin/ftp_del.php:83
+#: ../admin/browseforfolder2.php:150 ../admin/ftp_del.php:83
 #: ../admin/ftp_edit.php:99 ../admin/hta_adduser.php:68
 #: ../admin/hta_dodeluser.php:65 ../admin/hta_edit.php:115
 #: ../admin/mail_edit.php:116 ../admin/mail_manage_catchall.php:137
@@ -364,11 +364,11 @@ msgid ""
 "alternc.install"
 msgstr ""
 
-#: ../admin/adm_deactivate.php:46 ../class/m_admin.php:246
-#: ../class/m_admin.php:278 ../class/m_admin.php:796 ../class/m_admin.php:824
-#: ../class/m_admin.php:853 ../class/m_admin.php:906 ../class/m_admin.php:935
-#: ../class/m_admin.php:962 ../class/m_admin.php:1042
-#: ../class/m_admin.php:1066
+#: ../admin/adm_deactivate.php:46 ../class/m_admin.php:241
+#: ../class/m_admin.php:272 ../class/m_admin.php:780 ../class/m_admin.php:806
+#: ../class/m_admin.php:833 ../class/m_admin.php:886 ../class/m_admin.php:914
+#: ../class/m_admin.php:940 ../class/m_admin.php:1017
+#: ../class/m_admin.php:1041
 msgid "Account not found"
 msgstr ""
 
@@ -1101,7 +1101,7 @@ msgstr ""
 msgid "Add this account to the allowed list"
 msgstr ""
 
-#: ../admin/adm_panel.php:40 ../class/m_admin.php:107
+#: ../admin/adm_panel.php:40 ../class/m_admin.php:108
 msgid "Admin Control Panel"
 msgstr ""
 
@@ -1717,19 +1717,19 @@ msgstr ""
 msgid "Change my settings"
 msgstr ""
 
-#: ../admin/browseforfolder2.php:127
+#: ../admin/browseforfolder2.php:128
 msgid "Searching for a folder"
 msgstr ""
 
-#: ../admin/browseforfolder2.php:133
+#: ../admin/browseforfolder2.php:134
 msgid "Error, cannot find this folder"
 msgstr ""
 
-#: ../admin/browseforfolder2.php:135
+#: ../admin/browseforfolder2.php:136
 msgid "Back to the root folder"
 msgstr ""
 
-#: ../admin/browseforfolder2.php:148
+#: ../admin/browseforfolder2.php:149
 msgid "Select"
 msgstr ""
 
@@ -2264,7 +2264,7 @@ msgstr ""
 msgid "Password do not match"
 msgstr "Passwört"
 
-#: ../admin/ftp_edit.php:121 ../class/m_admin.php:1472 ../class/m_hta.php:292
+#: ../admin/ftp_edit.php:121 ../class/m_admin.php:1443 ../class/m_hta.php:292
 msgid "Please enter a password"
 msgstr ""
 
@@ -3941,15 +3941,15 @@ msgstr ""
 msgid "Domain can be installed, force NO DNS hosting"
 msgstr ""
 
-#: ../class/m_admin.php:84
+#: ../class/m_admin.php:86
 msgid "Administration"
 msgstr ""
 
-#: ../class/m_admin.php:92
+#: ../class/m_admin.php:94
 msgid "Manage AlternC accounts"
 msgstr ""
 
-#: ../class/m_admin.php:97
+#: ../class/m_admin.php:99
 #, fuzzy
 msgid "User Quotas"
 msgstr "Quotas"
@@ -3958,157 +3958,164 @@ msgstr "Quotas"
 msgid "PhpMyAdmin"
 msgstr ""
 
-#: ../class/m_admin.php:120
+#: ../class/m_admin.php:119
 msgid "Switch debug Off"
 msgstr ""
 
-#: ../class/m_admin.php:120
+#: ../class/m_admin.php:119
 msgid "Switch debug On"
 msgstr ""
 
-#: ../class/m_admin.php:127
+#: ../class/m_admin.php:125
 msgid "Applying..."
 msgstr ""
 
-#: ../class/m_admin.php:128
+#: ../class/m_admin.php:126
 msgid "Domain changes are already applying"
 msgstr ""
 
-#: ../class/m_admin.php:134
+#: ../class/m_admin.php:131
 msgid "Apply changes"
 msgstr ""
 
-#: ../class/m_admin.php:137
+#: ../class/m_admin.php:134
 msgid ""
 "Server configuration changes are applied every 5 minutes. Do you want to do "
 "it right now?"
 msgstr ""
 
-#: ../class/m_admin.php:212 ../class/m_admin.php:268 ../class/m_admin.php:342
-#: ../class/m_admin.php:431 ../class/m_admin.php:477 ../class/m_admin.php:513
-#: ../class/m_admin.php:595 ../class/m_admin.php:773 ../class/m_admin.php:816
-#: ../class/m_admin.php:845 ../class/m_admin.php:880
+#: ../class/m_admin.php:207 ../class/m_admin.php:262 ../class/m_admin.php:334
+#: ../class/m_admin.php:417 ../class/m_admin.php:462 ../class/m_admin.php:498
+#: ../class/m_admin.php:581 ../class/m_admin.php:759 ../class/m_admin.php:799
+#: ../class/m_admin.php:826 ../class/m_admin.php:860
 msgid "-- Only administrators can access this page! --"
 msgstr ""
 
-#: ../class/m_admin.php:383
+#: ../class/m_admin.php:373
 msgid ""
 "Invalid pattern type provided. Are you even performing a legitimate action?"
 msgstr ""
 
-#: ../class/m_admin.php:439
+#: ../class/m_admin.php:425
 msgid "Subject, message and sender are mandatory"
 msgstr ""
 
-#: ../class/m_admin.php:444
+#: ../class/m_admin.php:430
 msgid "Sender is syntaxically incorrect"
 msgstr ""
 
-#: ../class/m_admin.php:536
+#: ../class/m_admin.php:521
 msgid "-- Only administrators can do that! --"
 msgstr ""
 
-#: ../class/m_admin.php:542
+#: ../class/m_admin.php:527
 msgid "You don't seem to be allowed to delegate this domain"
 msgstr ""
 
-#: ../class/m_admin.php:599
+#: ../class/m_admin.php:585
 msgid "Missing db_server field"
 msgstr ""
 
-#: ../class/m_admin.php:603 ../class/m_admin.php:608
+#: ../class/m_admin.php:589 ../class/m_admin.php:594
 msgid "All fields are mandatory"
 msgstr ""
 
-#: ../class/m_admin.php:613
+#: ../class/m_admin.php:599
 msgid "Please enter a valid email address"
 msgstr ""
 
-#: ../class/m_admin.php:619
+#: ../class/m_admin.php:605
 msgid "Login can only contains characters a-z and 0-9"
 msgstr ""
 
-#: ../class/m_admin.php:626
+#: ../class/m_admin.php:612
 msgid "The login is too long (14 chars max)"
 msgstr ""
 
-#: ../class/m_admin.php:631
+#: ../class/m_admin.php:617
 msgid "Login can only contains characters a-z, 0-9 and -"
 msgstr ""
 
-#: ../class/m_admin.php:676
+#: ../class/m_admin.php:663
 msgid "This login already exists"
 msgstr ""
 
-#: ../class/m_admin.php:699
+#: ../class/m_admin.php:686
 #, php-format
 msgid "query failed: %s "
 msgstr ""
 
-#: ../class/m_admin.php:726
+#: ../class/m_admin.php:713
 #, php-format
 msgid "New account %s from %s on %s"
 msgstr ""
 
-#: ../class/m_admin.php:731
+#: ../class/m_admin.php:718
 #, php-format
 msgid "Cannot send email to %s"
 msgstr ""
 
-#: ../class/m_admin.php:735
+#: ../class/m_admin.php:722
 #, php-format
 msgid "Query failed: %s"
 msgstr ""
 
-#: ../class/m_admin.php:1046
+#: ../class/m_admin.php:1021
 msgid "This account is ALREADY an administrator account"
 msgstr ""
 
-#: ../class/m_admin.php:1070
+#: ../class/m_admin.php:1045
 msgid "This account is NOT an administrator account!"
 msgstr ""
 
-#: ../class/m_admin.php:1233
+#: ../class/m_admin.php:1208
 #, php-format
 msgid "Domain '%s' not found."
 msgstr ""
 
-#: ../class/m_admin.php:1253 ../class/m_admin.php:1289
-#: ../class/m_admin.php:1347
+#: ../class/m_admin.php:1227 ../class/m_admin.php:1262
+#: ../class/m_admin.php:1321
 #, fuzzy
 msgid "This TLD does not exist"
 msgstr "Miglied '%s' existiert nicht"
 
-#: ../class/m_admin.php:1314
+#: ../class/m_admin.php:1287
 msgid "The TLD name is mandatory"
 msgstr ""
 
-#: ../class/m_admin.php:1321
+#: ../class/m_admin.php:1294
 msgid "This TLD already exist"
 msgstr ""
 
-#: ../class/m_admin.php:1468
+#: ../class/m_admin.php:1439
 msgid "Please enter a login"
 msgstr ""
 
-#: ../class/m_admin.php:1478
+#: ../class/m_admin.php:1449
 msgid "-- Program error -- The requested password policy does not exist!"
 msgstr ""
 
-#: ../class/m_admin.php:1486
+#: ../class/m_admin.php:1457
 msgid "The password length is too short according to the password policy"
 msgstr ""
 
-#: ../class/m_admin.php:1491
+#: ../class/m_admin.php:1462
 msgid "The password is too long according to the password policy"
 msgstr ""
 
-#: ../class/m_admin.php:1501
+#: ../class/m_admin.php:1472
 msgid ""
-"The password policy prevents you to use your login name inside your password"
+"The password policy prevents you to use your login name inside your password "
+"or the other way around"
 msgstr ""
 
-#: ../class/m_admin.php:1525
+#: ../class/m_admin.php:1477
+msgid ""
+"The password policy prevents you to use something too similar from your "
+"login name inside your password"
+msgstr ""
+
+#: ../class/m_admin.php:1501
 msgid ""
 "Your password contains not enough different classes of character, between "
 "low-case, up-case, figures and special characters."
diff --git a/bureau/locales/en_US/LC_MESSAGES/messages.po b/bureau/locales/en_US/LC_MESSAGES/messages.po
index b439ba8d..f21b83f1 100644
--- a/bureau/locales/en_US/LC_MESSAGES/messages.po
+++ b/bureau/locales/en_US/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: $Id: admin.po,v 1.10 2004/11/01 15:55:44 anonymous Exp "
 "$\n"
 "Report-Msgid-Bugs-To: i18n@alternc.org\n"
-"POT-Creation-Date: 2015-05-12 15:54+0200\n"
+"POT-Creation-Date: 2015-06-16 14:09+0200\n"
 "PO-Revision-Date: 2002-06-16 13:50CEST\n"
 "Last-Translator: Benjamin Sonntag <benjamin@alternc.org>\n"
 "Language-Team: French <i18n@alternc.org>\n"
@@ -225,7 +225,7 @@ msgstr ""
 #: ../admin/adm_domstypeedit.php:134 ../admin/adm_edit.php:124
 #: ../admin/adm_quotaedit.php:88 ../admin/adm_tldadd.php:71
 #: ../admin/adm_tldedit.php:70 ../admin/bro_pref.php:150
-#: ../admin/browseforfolder2.php:149 ../admin/ftp_del.php:83
+#: ../admin/browseforfolder2.php:150 ../admin/ftp_del.php:83
 #: ../admin/ftp_edit.php:99 ../admin/hta_adduser.php:68
 #: ../admin/hta_dodeluser.php:65 ../admin/hta_edit.php:115
 #: ../admin/mail_edit.php:116 ../admin/mail_manage_catchall.php:137
@@ -357,11 +357,11 @@ msgid ""
 "alternc.install"
 msgstr ""
 
-#: ../admin/adm_deactivate.php:46 ../class/m_admin.php:246
-#: ../class/m_admin.php:278 ../class/m_admin.php:796 ../class/m_admin.php:824
-#: ../class/m_admin.php:853 ../class/m_admin.php:906 ../class/m_admin.php:935
-#: ../class/m_admin.php:962 ../class/m_admin.php:1042
-#: ../class/m_admin.php:1066
+#: ../admin/adm_deactivate.php:46 ../class/m_admin.php:241
+#: ../class/m_admin.php:272 ../class/m_admin.php:780 ../class/m_admin.php:806
+#: ../class/m_admin.php:833 ../class/m_admin.php:886 ../class/m_admin.php:914
+#: ../class/m_admin.php:940 ../class/m_admin.php:1017
+#: ../class/m_admin.php:1041
 msgid "Account not found"
 msgstr ""
 
@@ -1092,7 +1092,7 @@ msgstr ""
 msgid "Add this account to the allowed list"
 msgstr ""
 
-#: ../admin/adm_panel.php:40 ../class/m_admin.php:107
+#: ../admin/adm_panel.php:40 ../class/m_admin.php:108
 msgid "Admin Control Panel"
 msgstr ""
 
@@ -1702,19 +1702,19 @@ msgstr ""
 msgid "Change my settings"
 msgstr ""
 
-#: ../admin/browseforfolder2.php:127
+#: ../admin/browseforfolder2.php:128
 msgid "Searching for a folder"
 msgstr ""
 
-#: ../admin/browseforfolder2.php:133
+#: ../admin/browseforfolder2.php:134
 msgid "Error, cannot find this folder"
 msgstr ""
 
-#: ../admin/browseforfolder2.php:135
+#: ../admin/browseforfolder2.php:136
 msgid "Back to the root folder"
 msgstr ""
 
-#: ../admin/browseforfolder2.php:148
+#: ../admin/browseforfolder2.php:149
 msgid "Select"
 msgstr ""
 
@@ -2244,7 +2244,7 @@ msgstr ""
 msgid "Password do not match"
 msgstr ""
 
-#: ../admin/ftp_edit.php:121 ../class/m_admin.php:1472 ../class/m_hta.php:292
+#: ../admin/ftp_edit.php:121 ../class/m_admin.php:1443 ../class/m_hta.php:292
 msgid "Please enter a password"
 msgstr ""
 
@@ -3910,15 +3910,15 @@ msgstr ""
 msgid "Domain can be installed, force NO DNS hosting"
 msgstr ""
 
-#: ../class/m_admin.php:84
+#: ../class/m_admin.php:86
 msgid "Administration"
 msgstr ""
 
-#: ../class/m_admin.php:92
+#: ../class/m_admin.php:94
 msgid "Manage AlternC accounts"
 msgstr ""
 
-#: ../class/m_admin.php:97
+#: ../class/m_admin.php:99
 msgid "User Quotas"
 msgstr ""
 
@@ -3926,156 +3926,163 @@ msgstr ""
 msgid "PhpMyAdmin"
 msgstr ""
 
-#: ../class/m_admin.php:120
+#: ../class/m_admin.php:119
 msgid "Switch debug Off"
 msgstr ""
 
-#: ../class/m_admin.php:120
+#: ../class/m_admin.php:119
 msgid "Switch debug On"
 msgstr ""
 
-#: ../class/m_admin.php:127
+#: ../class/m_admin.php:125
 msgid "Applying..."
 msgstr ""
 
-#: ../class/m_admin.php:128
+#: ../class/m_admin.php:126
 msgid "Domain changes are already applying"
 msgstr ""
 
-#: ../class/m_admin.php:134
+#: ../class/m_admin.php:131
 msgid "Apply changes"
 msgstr ""
 
-#: ../class/m_admin.php:137
+#: ../class/m_admin.php:134
 msgid ""
 "Server configuration changes are applied every 5 minutes. Do you want to do "
 "it right now?"
 msgstr ""
 
-#: ../class/m_admin.php:212 ../class/m_admin.php:268 ../class/m_admin.php:342
-#: ../class/m_admin.php:431 ../class/m_admin.php:477 ../class/m_admin.php:513
-#: ../class/m_admin.php:595 ../class/m_admin.php:773 ../class/m_admin.php:816
-#: ../class/m_admin.php:845 ../class/m_admin.php:880
+#: ../class/m_admin.php:207 ../class/m_admin.php:262 ../class/m_admin.php:334
+#: ../class/m_admin.php:417 ../class/m_admin.php:462 ../class/m_admin.php:498
+#: ../class/m_admin.php:581 ../class/m_admin.php:759 ../class/m_admin.php:799
+#: ../class/m_admin.php:826 ../class/m_admin.php:860
 msgid "-- Only administrators can access this page! --"
 msgstr ""
 
-#: ../class/m_admin.php:383
+#: ../class/m_admin.php:373
 msgid ""
 "Invalid pattern type provided. Are you even performing a legitimate action?"
 msgstr ""
 
-#: ../class/m_admin.php:439
+#: ../class/m_admin.php:425
 msgid "Subject, message and sender are mandatory"
 msgstr ""
 
-#: ../class/m_admin.php:444
+#: ../class/m_admin.php:430
 msgid "Sender is syntaxically incorrect"
 msgstr ""
 
-#: ../class/m_admin.php:536
+#: ../class/m_admin.php:521
 msgid "-- Only administrators can do that! --"
 msgstr ""
 
-#: ../class/m_admin.php:542
+#: ../class/m_admin.php:527
 msgid "You don't seem to be allowed to delegate this domain"
 msgstr ""
 
-#: ../class/m_admin.php:599
+#: ../class/m_admin.php:585
 msgid "Missing db_server field"
 msgstr ""
 
-#: ../class/m_admin.php:603 ../class/m_admin.php:608
+#: ../class/m_admin.php:589 ../class/m_admin.php:594
 msgid "All fields are mandatory"
 msgstr ""
 
-#: ../class/m_admin.php:613
+#: ../class/m_admin.php:599
 msgid "Please enter a valid email address"
 msgstr ""
 
-#: ../class/m_admin.php:619
+#: ../class/m_admin.php:605
 msgid "Login can only contains characters a-z and 0-9"
 msgstr ""
 
-#: ../class/m_admin.php:626
+#: ../class/m_admin.php:612
 msgid "The login is too long (14 chars max)"
 msgstr ""
 
-#: ../class/m_admin.php:631
+#: ../class/m_admin.php:617
 msgid "Login can only contains characters a-z, 0-9 and -"
 msgstr ""
 
-#: ../class/m_admin.php:676
+#: ../class/m_admin.php:663
 msgid "This login already exists"
 msgstr ""
 
-#: ../class/m_admin.php:699
+#: ../class/m_admin.php:686
 #, php-format
 msgid "query failed: %s "
 msgstr ""
 
-#: ../class/m_admin.php:726
+#: ../class/m_admin.php:713
 #, php-format
 msgid "New account %s from %s on %s"
 msgstr ""
 
-#: ../class/m_admin.php:731
+#: ../class/m_admin.php:718
 #, php-format
 msgid "Cannot send email to %s"
 msgstr ""
 
-#: ../class/m_admin.php:735
+#: ../class/m_admin.php:722
 #, php-format
 msgid "Query failed: %s"
 msgstr ""
 
-#: ../class/m_admin.php:1046
+#: ../class/m_admin.php:1021
 msgid "This account is ALREADY an administrator account"
 msgstr ""
 
-#: ../class/m_admin.php:1070
+#: ../class/m_admin.php:1045
 msgid "This account is NOT an administrator account!"
 msgstr ""
 
-#: ../class/m_admin.php:1233
+#: ../class/m_admin.php:1208
 #, php-format
 msgid "Domain '%s' not found."
 msgstr ""
 
-#: ../class/m_admin.php:1253 ../class/m_admin.php:1289
-#: ../class/m_admin.php:1347
+#: ../class/m_admin.php:1227 ../class/m_admin.php:1262
+#: ../class/m_admin.php:1321
 msgid "This TLD does not exist"
 msgstr ""
 
-#: ../class/m_admin.php:1314
+#: ../class/m_admin.php:1287
 msgid "The TLD name is mandatory"
 msgstr ""
 
-#: ../class/m_admin.php:1321
+#: ../class/m_admin.php:1294
 msgid "This TLD already exist"
 msgstr ""
 
-#: ../class/m_admin.php:1468
+#: ../class/m_admin.php:1439
 msgid "Please enter a login"
 msgstr ""
 
-#: ../class/m_admin.php:1478
+#: ../class/m_admin.php:1449
 msgid "-- Program error -- The requested password policy does not exist!"
 msgstr ""
 
-#: ../class/m_admin.php:1486
+#: ../class/m_admin.php:1457
 msgid "The password length is too short according to the password policy"
 msgstr ""
 
-#: ../class/m_admin.php:1491
+#: ../class/m_admin.php:1462
 msgid "The password is too long according to the password policy"
 msgstr ""
 
-#: ../class/m_admin.php:1501
+#: ../class/m_admin.php:1472
 msgid ""
-"The password policy prevents you to use your login name inside your password"
+"The password policy prevents you to use your login name inside your password "
+"or the other way around"
 msgstr ""
 
-#: ../class/m_admin.php:1525
+#: ../class/m_admin.php:1477
+msgid ""
+"The password policy prevents you to use something too similar from your "
+"login name inside your password"
+msgstr ""
+
+#: ../class/m_admin.php:1501
 msgid ""
 "Your password contains not enough different classes of character, between "
 "low-case, up-case, figures and special characters."
diff --git a/bureau/locales/es_ES/LC_MESSAGES/messages.po b/bureau/locales/es_ES/LC_MESSAGES/messages.po
index d655ec60..e3a72453 100644
--- a/bureau/locales/es_ES/LC_MESSAGES/messages.po
+++ b/bureau/locales/es_ES/LC_MESSAGES/messages.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: i18n@alternc.org\n"
-"POT-Creation-Date: 2015-05-12 15:54+0200\n"
+"POT-Creation-Date: 2015-06-16 14:09+0200\n"
 "PO-Revision-Date: 2008-09-05 16:50+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <tech@alternc.org>\n"
@@ -247,7 +247,7 @@ msgstr "Crear la cuenta FTP."
 #: ../admin/adm_domstypeedit.php:134 ../admin/adm_edit.php:124
 #: ../admin/adm_quotaedit.php:88 ../admin/adm_tldadd.php:71
 #: ../admin/adm_tldedit.php:70 ../admin/bro_pref.php:150
-#: ../admin/browseforfolder2.php:149 ../admin/ftp_del.php:83
+#: ../admin/browseforfolder2.php:150 ../admin/ftp_del.php:83
 #: ../admin/ftp_edit.php:99 ../admin/hta_adduser.php:68
 #: ../admin/hta_dodeluser.php:65 ../admin/hta_edit.php:115
 #: ../admin/mail_edit.php:116 ../admin/mail_manage_catchall.php:137
@@ -386,11 +386,11 @@ msgid ""
 "alternc.install"
 msgstr ""
 
-#: ../admin/adm_deactivate.php:46 ../class/m_admin.php:246
-#: ../class/m_admin.php:278 ../class/m_admin.php:796 ../class/m_admin.php:824
-#: ../class/m_admin.php:853 ../class/m_admin.php:906 ../class/m_admin.php:935
-#: ../class/m_admin.php:962 ../class/m_admin.php:1042
-#: ../class/m_admin.php:1066
+#: ../admin/adm_deactivate.php:46 ../class/m_admin.php:241
+#: ../class/m_admin.php:272 ../class/m_admin.php:780 ../class/m_admin.php:806
+#: ../class/m_admin.php:833 ../class/m_admin.php:886 ../class/m_admin.php:914
+#: ../class/m_admin.php:940 ../class/m_admin.php:1017
+#: ../class/m_admin.php:1041
 #, fuzzy
 msgid "Account not found"
 msgstr "Tipo de cuenta"
@@ -1181,7 +1181,7 @@ msgstr ""
 msgid "Add this account to the allowed list"
 msgstr "Añadir esta cuenta a la lista de aquellas autorizadas."
 
-#: ../admin/adm_panel.php:40 ../class/m_admin.php:107
+#: ../admin/adm_panel.php:40 ../class/m_admin.php:108
 msgid "Admin Control Panel"
 msgstr "Panel Administrador"
 
@@ -1846,19 +1846,19 @@ msgstr "¿Regresar a la última carpeta visitada?"
 msgid "Change my settings"
 msgstr "Modificar mis preferencias"
 
-#: ../admin/browseforfolder2.php:127
+#: ../admin/browseforfolder2.php:128
 msgid "Searching for a folder"
 msgstr "Búsqueda de una carpeta"
 
-#: ../admin/browseforfolder2.php:133
+#: ../admin/browseforfolder2.php:134
 msgid "Error, cannot find this folder"
 msgstr "Error, no se puede conseguir esta carpeta"
 
-#: ../admin/browseforfolder2.php:135
+#: ../admin/browseforfolder2.php:136
 msgid "Back to the root folder"
 msgstr "Regresar al directorio raíz"
 
-#: ../admin/browseforfolder2.php:148
+#: ../admin/browseforfolder2.php:149
 msgid "Select"
 msgstr "Seleccionar"
 
@@ -2434,7 +2434,7 @@ msgstr "Por favor, entra una contraseña"
 msgid "Password do not match"
 msgstr "Las contraseñas no corresponden"
 
-#: ../admin/ftp_edit.php:121 ../class/m_admin.php:1472 ../class/m_hta.php:292
+#: ../admin/ftp_edit.php:121 ../class/m_admin.php:1443 ../class/m_hta.php:292
 msgid "Please enter a password"
 msgstr "Por favor, entra una contraseña"
 
@@ -4249,16 +4249,16 @@ msgstr "Se puede instalar el dominio, ninguna verificación"
 msgid "Domain can be installed, force NO DNS hosting"
 msgstr "El dominio puede ser instalado (pero no se maneja el DNS)"
 
-#: ../class/m_admin.php:84
+#: ../class/m_admin.php:86
 msgid "Administration"
 msgstr "Administración"
 
-#: ../class/m_admin.php:92
+#: ../class/m_admin.php:94
 #, fuzzy
 msgid "Manage AlternC accounts"
 msgstr "Cambiar la dirección de correo de la cuenta"
 
-#: ../class/m_admin.php:97
+#: ../class/m_admin.php:99
 #, fuzzy
 msgid "User Quotas"
 msgstr "Cuotas"
@@ -4267,164 +4267,171 @@ msgstr "Cuotas"
 msgid "PhpMyAdmin"
 msgstr ""
 
-#: ../class/m_admin.php:120
+#: ../class/m_admin.php:119
 msgid "Switch debug Off"
 msgstr ""
 
-#: ../class/m_admin.php:120
+#: ../class/m_admin.php:119
 msgid "Switch debug On"
 msgstr ""
 
-#: ../class/m_admin.php:127
+#: ../class/m_admin.php:125
 #, fuzzy
 msgid "Applying..."
 msgstr "extrayendo..."
 
-#: ../class/m_admin.php:128
+#: ../class/m_admin.php:126
 msgid "Domain changes are already applying"
 msgstr ""
 
-#: ../class/m_admin.php:134
+#: ../class/m_admin.php:131
 #, fuzzy
 msgid "Apply changes"
 msgstr "Cambio de contraseña"
 
-#: ../class/m_admin.php:137
+#: ../class/m_admin.php:134
 msgid ""
 "Server configuration changes are applied every 5 minutes. Do you want to do "
 "it right now?"
 msgstr ""
 
-#: ../class/m_admin.php:212 ../class/m_admin.php:268 ../class/m_admin.php:342
-#: ../class/m_admin.php:431 ../class/m_admin.php:477 ../class/m_admin.php:513
-#: ../class/m_admin.php:595 ../class/m_admin.php:773 ../class/m_admin.php:816
-#: ../class/m_admin.php:845 ../class/m_admin.php:880
+#: ../class/m_admin.php:207 ../class/m_admin.php:262 ../class/m_admin.php:334
+#: ../class/m_admin.php:417 ../class/m_admin.php:462 ../class/m_admin.php:498
+#: ../class/m_admin.php:581 ../class/m_admin.php:759 ../class/m_admin.php:799
+#: ../class/m_admin.php:826 ../class/m_admin.php:860
 msgid "-- Only administrators can access this page! --"
 msgstr ""
 
-#: ../class/m_admin.php:383
+#: ../class/m_admin.php:373
 msgid ""
 "Invalid pattern type provided. Are you even performing a legitimate action?"
 msgstr ""
 
-#: ../class/m_admin.php:439
+#: ../class/m_admin.php:425
 msgid "Subject, message and sender are mandatory"
 msgstr ""
 
-#: ../class/m_admin.php:444
+#: ../class/m_admin.php:430
 msgid "Sender is syntaxically incorrect"
 msgstr ""
 
-#: ../class/m_admin.php:536
+#: ../class/m_admin.php:521
 msgid "-- Only administrators can do that! --"
 msgstr ""
 
-#: ../class/m_admin.php:542
+#: ../class/m_admin.php:527
 #, fuzzy
 msgid "You don't seem to be allowed to delegate this domain"
 msgstr "Confirmar la supresión del dominio %s"
 
-#: ../class/m_admin.php:599
+#: ../class/m_admin.php:585
 msgid "Missing db_server field"
 msgstr ""
 
-#: ../class/m_admin.php:603 ../class/m_admin.php:608
+#: ../class/m_admin.php:589 ../class/m_admin.php:594
 msgid "All fields are mandatory"
 msgstr ""
 
-#: ../class/m_admin.php:613
+#: ../class/m_admin.php:599
 #, fuzzy
 msgid "Please enter a valid email address"
 msgstr "Añadir este buzón"
 
-#: ../class/m_admin.php:619
+#: ../class/m_admin.php:605
 msgid "Login can only contains characters a-z and 0-9"
 msgstr ""
 
-#: ../class/m_admin.php:626
+#: ../class/m_admin.php:612
 msgid "The login is too long (14 chars max)"
 msgstr ""
 
-#: ../class/m_admin.php:631
+#: ../class/m_admin.php:617
 msgid "Login can only contains characters a-z, 0-9 and -"
 msgstr ""
 
-#: ../class/m_admin.php:676
+#: ../class/m_admin.php:663
 msgid "This login already exists"
 msgstr ""
 
-#: ../class/m_admin.php:699
+#: ../class/m_admin.php:686
 #, php-format
 msgid "query failed: %s "
 msgstr ""
 
-#: ../class/m_admin.php:726
+#: ../class/m_admin.php:713
 #, php-format
 msgid "New account %s from %s on %s"
 msgstr ""
 
-#: ../class/m_admin.php:731
+#: ../class/m_admin.php:718
 #, php-format
 msgid "Cannot send email to %s"
 msgstr ""
 
-#: ../class/m_admin.php:735
+#: ../class/m_admin.php:722
 #, php-format
 msgid "Query failed: %s"
 msgstr ""
 
-#: ../class/m_admin.php:1046
+#: ../class/m_admin.php:1021
 #, fuzzy
 msgid "This account is ALREADY an administrator account"
 msgstr "Esta cuenta es un cuenta de administrador"
 
-#: ../class/m_admin.php:1070
+#: ../class/m_admin.php:1045
 #, fuzzy
 msgid "This account is NOT an administrator account!"
 msgstr "Esta cuenta es un cuenta de administrador"
 
-#: ../class/m_admin.php:1233
+#: ../class/m_admin.php:1208
 #, fuzzy, php-format
 msgid "Domain '%s' not found."
 msgstr "Dominio %s borrado"
 
-#: ../class/m_admin.php:1253 ../class/m_admin.php:1289
-#: ../class/m_admin.php:1347
+#: ../class/m_admin.php:1227 ../class/m_admin.php:1262
+#: ../class/m_admin.php:1321
 #, fuzzy
 msgid "This TLD does not exist"
 msgstr "El usuario no existe"
 
-#: ../class/m_admin.php:1314
+#: ../class/m_admin.php:1287
 msgid "The TLD name is mandatory"
 msgstr ""
 
-#: ../class/m_admin.php:1321
+#: ../class/m_admin.php:1294
 msgid "This TLD already exist"
 msgstr ""
 
-#: ../class/m_admin.php:1468
+#: ../class/m_admin.php:1439
 #, fuzzy
 msgid "Please enter a login"
 msgstr "Por favor, entra una contraseña"
 
-#: ../class/m_admin.php:1478
+#: ../class/m_admin.php:1449
 msgid "-- Program error -- The requested password policy does not exist!"
 msgstr ""
 
-#: ../class/m_admin.php:1486
+#: ../class/m_admin.php:1457
 msgid "The password length is too short according to the password policy"
 msgstr ""
 
-#: ../class/m_admin.php:1491
+#: ../class/m_admin.php:1462
 msgid "The password is too long according to the password policy"
 msgstr ""
 
-#: ../class/m_admin.php:1501
+#: ../class/m_admin.php:1472
 msgid ""
-"The password policy prevents you to use your login name inside your password"
+"The password policy prevents you to use your login name inside your password "
+"or the other way around"
 msgstr ""
 
-#: ../class/m_admin.php:1525
+#: ../class/m_admin.php:1477
+msgid ""
+"The password policy prevents you to use something too similar from your "
+"login name inside your password"
+msgstr ""
+
+#: ../class/m_admin.php:1501
 msgid ""
 "Your password contains not enough different classes of character, between "
 "low-case, up-case, figures and special characters."
diff --git a/bureau/locales/fr_FR/LC_MESSAGES/messages.po b/bureau/locales/fr_FR/LC_MESSAGES/messages.po
index d52dfa2c..86ced182 100644
--- a/bureau/locales/fr_FR/LC_MESSAGES/messages.po
+++ b/bureau/locales/fr_FR/LC_MESSAGES/messages.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: $Id: admin.po,v 1.10 2004/11/01 15:55:44 anonymous Exp "
 "$\n"
 "Report-Msgid-Bugs-To: i18n@alternc.org\n"
-"POT-Creation-Date: 2015-05-12 15:54+0200\n"
-"PO-Revision-Date: 2015-04-27 09:01+0200\n"
+"POT-Creation-Date: 2015-06-16 14:09+0200\n"
+"PO-Revision-Date: 2015-06-16 14:11+0200\n"
 "Last-Translator: Benjamin Sonntag <benjamin@sonntag.fr>\n"
 "Language-Team: français <team@alternc.org>\n"
 "Language: fr\n"
@@ -243,7 +243,7 @@ msgstr "Créer ce compte AlternC"
 #: ../admin/adm_domstypeedit.php:134 ../admin/adm_edit.php:124
 #: ../admin/adm_quotaedit.php:88 ../admin/adm_tldadd.php:71
 #: ../admin/adm_tldedit.php:70 ../admin/bro_pref.php:150
-#: ../admin/browseforfolder2.php:149 ../admin/ftp_del.php:83
+#: ../admin/browseforfolder2.php:150 ../admin/ftp_del.php:83
 #: ../admin/ftp_edit.php:99 ../admin/hta_adduser.php:68
 #: ../admin/hta_dodeluser.php:65 ../admin/hta_edit.php:115
 #: ../admin/mail_edit.php:116 ../admin/mail_manage_catchall.php:137
@@ -383,11 +383,11 @@ msgstr ""
 "Pour mettre à jour la liste des serveurs visibles dans PhpMyAdmin, lancez "
 "alternc.install"
 
-#: ../admin/adm_deactivate.php:46 ../class/m_admin.php:246
-#: ../class/m_admin.php:278 ../class/m_admin.php:796 ../class/m_admin.php:824
-#: ../class/m_admin.php:853 ../class/m_admin.php:906 ../class/m_admin.php:935
-#: ../class/m_admin.php:962 ../class/m_admin.php:1042
-#: ../class/m_admin.php:1066
+#: ../admin/adm_deactivate.php:46 ../class/m_admin.php:241
+#: ../class/m_admin.php:272 ../class/m_admin.php:780 ../class/m_admin.php:806
+#: ../class/m_admin.php:833 ../class/m_admin.php:886 ../class/m_admin.php:914
+#: ../class/m_admin.php:940 ../class/m_admin.php:1017
+#: ../class/m_admin.php:1041
 msgid "Account not found"
 msgstr "Compte non trouvé"
 
@@ -1154,7 +1154,7 @@ msgstr ""
 msgid "Add this account to the allowed list"
 msgstr "Ajouter ce compte à la liste des autorisés."
 
-#: ../admin/adm_panel.php:40 ../class/m_admin.php:107
+#: ../admin/adm_panel.php:40 ../class/m_admin.php:108
 msgid "Admin Control Panel"
 msgstr "Panneau Administrateur"
 
@@ -1815,19 +1815,19 @@ msgstr "Revenir au dernier répertoire visité ?"
 msgid "Change my settings"
 msgstr "Modifier mes préférences"
 
-#: ../admin/browseforfolder2.php:127
+#: ../admin/browseforfolder2.php:128
 msgid "Searching for a folder"
 msgstr "Recherche d'un répertoire"
 
-#: ../admin/browseforfolder2.php:133
+#: ../admin/browseforfolder2.php:134
 msgid "Error, cannot find this folder"
 msgstr "Erreur, impossible de trouver ce répertoire"
 
-#: ../admin/browseforfolder2.php:135
+#: ../admin/browseforfolder2.php:136
 msgid "Back to the root folder"
 msgstr "Retour au répertoire racine"
 
-#: ../admin/browseforfolder2.php:148
+#: ../admin/browseforfolder2.php:149
 msgid "Select"
 msgstr "Sélectionner"
 
@@ -2382,7 +2382,7 @@ msgstr "Cliquez ici pour modifier le mot de passe"
 msgid "Password do not match"
 msgstr "Les mots de passe ne correspondent pas"
 
-#: ../admin/ftp_edit.php:121 ../class/m_admin.php:1472 ../class/m_hta.php:292
+#: ../admin/ftp_edit.php:121 ../class/m_admin.php:1443 ../class/m_hta.php:292
 msgid "Please enter a password"
 msgstr "Veuillez entrer un mot de passe"
 
@@ -2793,7 +2793,7 @@ msgstr ""
 
 #: ../admin/mail_doedit.php:120
 msgid "Your email has been edited successfully"
-msgstr "Votre nouveau domaine %s a été installé avec succès\t"
+msgstr "L'adresse email a été modifiée avec succès"
 
 #: ../admin/mail_edit.php:53
 #, php-format
@@ -4169,15 +4169,15 @@ msgstr "Le domaine peut être installé sans aucun contrôle"
 msgid "Domain can be installed, force NO DNS hosting"
 msgstr "Le domaine peut être installé, (ne gère pas les DNS cependant)"
 
-#: ../class/m_admin.php:84
+#: ../class/m_admin.php:86
 msgid "Administration"
 msgstr "Administration"
 
-#: ../class/m_admin.php:92
+#: ../class/m_admin.php:94
 msgid "Manage AlternC accounts"
 msgstr "Gérer les comptes AlternC"
 
-#: ../class/m_admin.php:97
+#: ../class/m_admin.php:99
 msgid "User Quotas"
 msgstr "Quotas Utilisateurs"
 
@@ -4185,27 +4185,27 @@ msgstr "Quotas Utilisateurs"
 msgid "PhpMyAdmin"
 msgstr "PhpMyAdmin"
 
-#: ../class/m_admin.php:120
+#: ../class/m_admin.php:119
 msgid "Switch debug Off"
 msgstr "Arrêter le Debug"
 
-#: ../class/m_admin.php:120
+#: ../class/m_admin.php:119
 msgid "Switch debug On"
 msgstr "Activer le Debug"
 
-#: ../class/m_admin.php:127
+#: ../class/m_admin.php:125
 msgid "Applying..."
 msgstr "En cours..."
 
-#: ../class/m_admin.php:128
+#: ../class/m_admin.php:126
 msgid "Domain changes are already applying"
 msgstr "L'application des changements est déjà en cours"
 
-#: ../class/m_admin.php:134
+#: ../class/m_admin.php:131
 msgid "Apply changes"
 msgstr "Appliquer les modifications"
 
-#: ../class/m_admin.php:137
+#: ../class/m_admin.php:134
 msgid ""
 "Server configuration changes are applied every 5 minutes. Do you want to do "
 "it right now?"
@@ -4213,137 +4213,146 @@ msgstr ""
 "L'application des modifications sur les serveurs a lieu toutes les 5 "
 "minutes. Voulez-vous les appliquer maintenant ?"
 
-#: ../class/m_admin.php:212 ../class/m_admin.php:268 ../class/m_admin.php:342
-#: ../class/m_admin.php:431 ../class/m_admin.php:477 ../class/m_admin.php:513
-#: ../class/m_admin.php:595 ../class/m_admin.php:773 ../class/m_admin.php:816
-#: ../class/m_admin.php:845 ../class/m_admin.php:880
+#: ../class/m_admin.php:207 ../class/m_admin.php:262 ../class/m_admin.php:334
+#: ../class/m_admin.php:417 ../class/m_admin.php:462 ../class/m_admin.php:498
+#: ../class/m_admin.php:581 ../class/m_admin.php:759 ../class/m_admin.php:799
+#: ../class/m_admin.php:826 ../class/m_admin.php:860
 msgid "-- Only administrators can access this page! --"
 msgstr "-- Seuls les administrateurs peuvent accéder à cette page ! --"
 
-#: ../class/m_admin.php:383
+#: ../class/m_admin.php:373
 msgid ""
 "Invalid pattern type provided. Are you even performing a legitimate action?"
 msgstr ""
 "Type de motif invalide. Êtes-vous sûr de demander une action légitime ?"
 
-#: ../class/m_admin.php:439
+#: ../class/m_admin.php:425
 msgid "Subject, message and sender are mandatory"
 msgstr "Le sujet, le message et l'expéditeur sont obligatoires"
 
-#: ../class/m_admin.php:444
+#: ../class/m_admin.php:430
 msgid "Sender is syntaxically incorrect"
 msgstr "L'expéditeur est syntaxiquement incorrect"
 
-#: ../class/m_admin.php:536
+#: ../class/m_admin.php:521
 msgid "-- Only administrators can do that! --"
 msgstr "-- Seuls les administrateurs peuvent faire cela ! --"
 
-#: ../class/m_admin.php:542
+#: ../class/m_admin.php:527
 msgid "You don't seem to be allowed to delegate this domain"
 msgstr "Il semble que vous n'êtes pas autorisé à déléguer ce domaine"
 
-#: ../class/m_admin.php:599
+#: ../class/m_admin.php:585
 msgid "Missing db_server field"
 msgstr "Le champ db_server manque"
 
-#: ../class/m_admin.php:603 ../class/m_admin.php:608
+#: ../class/m_admin.php:589 ../class/m_admin.php:594
 msgid "All fields are mandatory"
 msgstr "Tous les champs sont requis"
 
-#: ../class/m_admin.php:613
+#: ../class/m_admin.php:599
 msgid "Please enter a valid email address"
 msgstr "Merci d'entrer une adresse email valide"
 
-#: ../class/m_admin.php:619
+#: ../class/m_admin.php:605
 msgid "Login can only contains characters a-z and 0-9"
 msgstr "Le nom d'utilisateur ne peut contenir que les caractères a-z et 0-9"
 
-#: ../class/m_admin.php:626
+#: ../class/m_admin.php:612
 msgid "The login is too long (14 chars max)"
 msgstr "Le nom d'utilisateur est trop long (14 caractères maximum)"
 
-#: ../class/m_admin.php:631
+#: ../class/m_admin.php:617
 msgid "Login can only contains characters a-z, 0-9 and -"
 msgstr "Le nom d'utilisateur ne peut contenir que les caractères a-z, 0-9 et -"
 
-#: ../class/m_admin.php:676
+#: ../class/m_admin.php:663
 msgid "This login already exists"
 msgstr "Ce nom d'utilisateur existe déjà"
 
-#: ../class/m_admin.php:699
+#: ../class/m_admin.php:686
 #, php-format
 msgid "query failed: %s "
 msgstr "Une requête a échoué : %s"
 
-#: ../class/m_admin.php:726
+#: ../class/m_admin.php:713
 #, php-format
 msgid "New account %s from %s on %s"
 msgstr "Nouveau compte %s de %s à %s"
 
-#: ../class/m_admin.php:731
+#: ../class/m_admin.php:718
 #, php-format
 msgid "Cannot send email to %s"
 msgstr "Impossible d'envoyer un mail à %s"
 
-#: ../class/m_admin.php:735
+#: ../class/m_admin.php:722
 #, php-format
 msgid "Query failed: %s"
 msgstr "Une requête a échoué : %s"
 
-#: ../class/m_admin.php:1046
+#: ../class/m_admin.php:1021
 msgid "This account is ALREADY an administrator account"
 msgstr "Ce compte est DÉJÀ un compte administrateur"
 
-#: ../class/m_admin.php:1070
+#: ../class/m_admin.php:1045
 msgid "This account is NOT an administrator account!"
 msgstr "Ce compte n'est PAS un compte administrateur"
 
-#: ../class/m_admin.php:1233
+#: ../class/m_admin.php:1208
 #, php-format
 msgid "Domain '%s' not found."
 msgstr "Domaine '%s' non trouvé."
 
-#: ../class/m_admin.php:1253 ../class/m_admin.php:1289
-#: ../class/m_admin.php:1347
+#: ../class/m_admin.php:1227 ../class/m_admin.php:1262
+#: ../class/m_admin.php:1321
 msgid "This TLD does not exist"
 msgstr "Ce TLD n'existe pas"
 
-#: ../class/m_admin.php:1314
+#: ../class/m_admin.php:1287
 msgid "The TLD name is mandatory"
 msgstr "Le nom du TLD est requis"
 
-#: ../class/m_admin.php:1321
+#: ../class/m_admin.php:1294
 msgid "This TLD already exist"
 msgstr "Ce TLD existe déjà"
 
-#: ../class/m_admin.php:1468
+#: ../class/m_admin.php:1439
 msgid "Please enter a login"
 msgstr "Veuillez entrer un nom d'utilisateur"
 
-#: ../class/m_admin.php:1478
+#: ../class/m_admin.php:1449
 msgid "-- Program error -- The requested password policy does not exist!"
 msgstr ""
 "-- Erreur du programme -- La politique de mot de passe demandée n'existe "
 "pas !"
 
-#: ../class/m_admin.php:1486
+#: ../class/m_admin.php:1457
 msgid "The password length is too short according to the password policy"
 msgstr ""
 "Le mot de passe est trop court conformément à la politique de mot de passe"
 
-#: ../class/m_admin.php:1491
+#: ../class/m_admin.php:1462
 msgid "The password is too long according to the password policy"
 msgstr ""
 "Le mot de passe est trop long conformément à la politique de mot de passe"
 
-#: ../class/m_admin.php:1501
+#: ../class/m_admin.php:1472
 msgid ""
-"The password policy prevents you to use your login name inside your password"
+"The password policy prevents you to use your login name inside your password "
+"or the other way around"
 msgstr ""
 "La politique de mots de passe interdit l'utilisation de votre nom "
-"d'utilisateur dans votre mot de passe"
+"d'utilisateur dans votre mot de passe ou l'inverse"
 
-#: ../class/m_admin.php:1525
+#: ../class/m_admin.php:1477
+msgid ""
+"The password policy prevents you to use something too similar from your "
+"login name inside your password"
+msgstr ""
+"La politique de mots de passe interdit l'utilisation d'un mot de passe trop "
+"proche de votre nom d'utilisateur"
+
+#: ../class/m_admin.php:1501
 msgid ""
 "Your password contains not enough different classes of character, between "
 "low-case, up-case, figures and special characters."
diff --git a/bureau/locales/it_IT/LC_MESSAGES/messages.po b/bureau/locales/it_IT/LC_MESSAGES/messages.po
index f39f807f..ea6690fd 100644
--- a/bureau/locales/it_IT/LC_MESSAGES/messages.po
+++ b/bureau/locales/it_IT/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AlternC 2.0\n"
 "Report-Msgid-Bugs-To: i18n@alternc.org\n"
-"POT-Creation-Date: 2015-05-12 15:54+0200\n"
+"POT-Creation-Date: 2015-06-16 14:09+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -225,7 +225,7 @@ msgstr ""
 #: ../admin/adm_domstypeedit.php:134 ../admin/adm_edit.php:124
 #: ../admin/adm_quotaedit.php:88 ../admin/adm_tldadd.php:71
 #: ../admin/adm_tldedit.php:70 ../admin/bro_pref.php:150
-#: ../admin/browseforfolder2.php:149 ../admin/ftp_del.php:83
+#: ../admin/browseforfolder2.php:150 ../admin/ftp_del.php:83
 #: ../admin/ftp_edit.php:99 ../admin/hta_adduser.php:68
 #: ../admin/hta_dodeluser.php:65 ../admin/hta_edit.php:115
 #: ../admin/mail_edit.php:116 ../admin/mail_manage_catchall.php:137
@@ -357,11 +357,11 @@ msgid ""
 "alternc.install"
 msgstr ""
 
-#: ../admin/adm_deactivate.php:46 ../class/m_admin.php:246
-#: ../class/m_admin.php:278 ../class/m_admin.php:796 ../class/m_admin.php:824
-#: ../class/m_admin.php:853 ../class/m_admin.php:906 ../class/m_admin.php:935
-#: ../class/m_admin.php:962 ../class/m_admin.php:1042
-#: ../class/m_admin.php:1066
+#: ../admin/adm_deactivate.php:46 ../class/m_admin.php:241
+#: ../class/m_admin.php:272 ../class/m_admin.php:780 ../class/m_admin.php:806
+#: ../class/m_admin.php:833 ../class/m_admin.php:886 ../class/m_admin.php:914
+#: ../class/m_admin.php:940 ../class/m_admin.php:1017
+#: ../class/m_admin.php:1041
 msgid "Account not found"
 msgstr ""
 
@@ -1092,7 +1092,7 @@ msgstr ""
 msgid "Add this account to the allowed list"
 msgstr ""
 
-#: ../admin/adm_panel.php:40 ../class/m_admin.php:107
+#: ../admin/adm_panel.php:40 ../class/m_admin.php:108
 msgid "Admin Control Panel"
 msgstr ""
 
@@ -1702,19 +1702,19 @@ msgstr ""
 msgid "Change my settings"
 msgstr ""
 
-#: ../admin/browseforfolder2.php:127
+#: ../admin/browseforfolder2.php:128
 msgid "Searching for a folder"
 msgstr ""
 
-#: ../admin/browseforfolder2.php:133
+#: ../admin/browseforfolder2.php:134
 msgid "Error, cannot find this folder"
 msgstr ""
 
-#: ../admin/browseforfolder2.php:135
+#: ../admin/browseforfolder2.php:136
 msgid "Back to the root folder"
 msgstr ""
 
-#: ../admin/browseforfolder2.php:148
+#: ../admin/browseforfolder2.php:149
 msgid "Select"
 msgstr ""
 
@@ -2244,7 +2244,7 @@ msgstr ""
 msgid "Password do not match"
 msgstr ""
 
-#: ../admin/ftp_edit.php:121 ../class/m_admin.php:1472 ../class/m_hta.php:292
+#: ../admin/ftp_edit.php:121 ../class/m_admin.php:1443 ../class/m_hta.php:292
 msgid "Please enter a password"
 msgstr ""
 
@@ -3910,15 +3910,15 @@ msgstr ""
 msgid "Domain can be installed, force NO DNS hosting"
 msgstr ""
 
-#: ../class/m_admin.php:84
+#: ../class/m_admin.php:86
 msgid "Administration"
 msgstr ""
 
-#: ../class/m_admin.php:92
+#: ../class/m_admin.php:94
 msgid "Manage AlternC accounts"
 msgstr ""
 
-#: ../class/m_admin.php:97
+#: ../class/m_admin.php:99
 msgid "User Quotas"
 msgstr ""
 
@@ -3926,156 +3926,163 @@ msgstr ""
 msgid "PhpMyAdmin"
 msgstr ""
 
-#: ../class/m_admin.php:120
+#: ../class/m_admin.php:119
 msgid "Switch debug Off"
 msgstr ""
 
-#: ../class/m_admin.php:120
+#: ../class/m_admin.php:119
 msgid "Switch debug On"
 msgstr ""
 
-#: ../class/m_admin.php:127
+#: ../class/m_admin.php:125
 msgid "Applying..."
 msgstr ""
 
-#: ../class/m_admin.php:128
+#: ../class/m_admin.php:126
 msgid "Domain changes are already applying"
 msgstr ""
 
-#: ../class/m_admin.php:134
+#: ../class/m_admin.php:131
 msgid "Apply changes"
 msgstr ""
 
-#: ../class/m_admin.php:137
+#: ../class/m_admin.php:134
 msgid ""
 "Server configuration changes are applied every 5 minutes. Do you want to do "
 "it right now?"
 msgstr ""
 
-#: ../class/m_admin.php:212 ../class/m_admin.php:268 ../class/m_admin.php:342
-#: ../class/m_admin.php:431 ../class/m_admin.php:477 ../class/m_admin.php:513
-#: ../class/m_admin.php:595 ../class/m_admin.php:773 ../class/m_admin.php:816
-#: ../class/m_admin.php:845 ../class/m_admin.php:880
+#: ../class/m_admin.php:207 ../class/m_admin.php:262 ../class/m_admin.php:334
+#: ../class/m_admin.php:417 ../class/m_admin.php:462 ../class/m_admin.php:498
+#: ../class/m_admin.php:581 ../class/m_admin.php:759 ../class/m_admin.php:799
+#: ../class/m_admin.php:826 ../class/m_admin.php:860
 msgid "-- Only administrators can access this page! --"
 msgstr ""
 
-#: ../class/m_admin.php:383
+#: ../class/m_admin.php:373
 msgid ""
 "Invalid pattern type provided. Are you even performing a legitimate action?"
 msgstr ""
 
-#: ../class/m_admin.php:439
+#: ../class/m_admin.php:425
 msgid "Subject, message and sender are mandatory"
 msgstr ""
 
-#: ../class/m_admin.php:444
+#: ../class/m_admin.php:430
 msgid "Sender is syntaxically incorrect"
 msgstr ""
 
-#: ../class/m_admin.php:536
+#: ../class/m_admin.php:521
 msgid "-- Only administrators can do that! --"
 msgstr ""
 
-#: ../class/m_admin.php:542
+#: ../class/m_admin.php:527
 msgid "You don't seem to be allowed to delegate this domain"
 msgstr ""
 
-#: ../class/m_admin.php:599
+#: ../class/m_admin.php:585
 msgid "Missing db_server field"
 msgstr ""
 
-#: ../class/m_admin.php:603 ../class/m_admin.php:608
+#: ../class/m_admin.php:589 ../class/m_admin.php:594
 msgid "All fields are mandatory"
 msgstr ""
 
-#: ../class/m_admin.php:613
+#: ../class/m_admin.php:599
 msgid "Please enter a valid email address"
 msgstr ""
 
-#: ../class/m_admin.php:619
+#: ../class/m_admin.php:605
 msgid "Login can only contains characters a-z and 0-9"
 msgstr ""
 
-#: ../class/m_admin.php:626
+#: ../class/m_admin.php:612
 msgid "The login is too long (14 chars max)"
 msgstr ""
 
-#: ../class/m_admin.php:631
+#: ../class/m_admin.php:617
 msgid "Login can only contains characters a-z, 0-9 and -"
 msgstr ""
 
-#: ../class/m_admin.php:676
+#: ../class/m_admin.php:663
 msgid "This login already exists"
 msgstr ""
 
-#: ../class/m_admin.php:699
+#: ../class/m_admin.php:686
 #, php-format
 msgid "query failed: %s "
 msgstr ""
 
-#: ../class/m_admin.php:726
+#: ../class/m_admin.php:713
 #, php-format
 msgid "New account %s from %s on %s"
 msgstr ""
 
-#: ../class/m_admin.php:731
+#: ../class/m_admin.php:718
 #, php-format
 msgid "Cannot send email to %s"
 msgstr ""
 
-#: ../class/m_admin.php:735
+#: ../class/m_admin.php:722
 #, php-format
 msgid "Query failed: %s"
 msgstr ""
 
-#: ../class/m_admin.php:1046
+#: ../class/m_admin.php:1021
 msgid "This account is ALREADY an administrator account"
 msgstr ""
 
-#: ../class/m_admin.php:1070
+#: ../class/m_admin.php:1045
 msgid "This account is NOT an administrator account!"
 msgstr ""
 
-#: ../class/m_admin.php:1233
+#: ../class/m_admin.php:1208
 #, php-format
 msgid "Domain '%s' not found."
 msgstr ""
 
-#: ../class/m_admin.php:1253 ../class/m_admin.php:1289
-#: ../class/m_admin.php:1347
+#: ../class/m_admin.php:1227 ../class/m_admin.php:1262
+#: ../class/m_admin.php:1321
 msgid "This TLD does not exist"
 msgstr ""
 
-#: ../class/m_admin.php:1314
+#: ../class/m_admin.php:1287
 msgid "The TLD name is mandatory"
 msgstr ""
 
-#: ../class/m_admin.php:1321
+#: ../class/m_admin.php:1294
 msgid "This TLD already exist"
 msgstr ""
 
-#: ../class/m_admin.php:1468
+#: ../class/m_admin.php:1439
 msgid "Please enter a login"
 msgstr ""
 
-#: ../class/m_admin.php:1478
+#: ../class/m_admin.php:1449
 msgid "-- Program error -- The requested password policy does not exist!"
 msgstr ""
 
-#: ../class/m_admin.php:1486
+#: ../class/m_admin.php:1457
 msgid "The password length is too short according to the password policy"
 msgstr ""
 
-#: ../class/m_admin.php:1491
+#: ../class/m_admin.php:1462
 msgid "The password is too long according to the password policy"
 msgstr ""
 
-#: ../class/m_admin.php:1501
+#: ../class/m_admin.php:1472
 msgid ""
-"The password policy prevents you to use your login name inside your password"
+"The password policy prevents you to use your login name inside your password "
+"or the other way around"
 msgstr ""
 
-#: ../class/m_admin.php:1525
+#: ../class/m_admin.php:1477
+msgid ""
+"The password policy prevents you to use something too similar from your "
+"login name inside your password"
+msgstr ""
+
+#: ../class/m_admin.php:1501
 msgid ""
 "Your password contains not enough different classes of character, between "
 "low-case, up-case, figures and special characters."
diff --git a/bureau/locales/messages.pot b/bureau/locales/messages.pot
index 21e3803c..e5843709 100644
--- a/bureau/locales/messages.pot
+++ b/bureau/locales/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AlternC 2.0\n"
 "Report-Msgid-Bugs-To: i18n@alternc.org\n"
-"POT-Creation-Date: 2015-05-12 15:54+0200\n"
+"POT-Creation-Date: 2015-06-16 14:09+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -225,7 +225,7 @@ msgstr ""
 #: ../admin/adm_domstypeedit.php:134 ../admin/adm_edit.php:124
 #: ../admin/adm_quotaedit.php:88 ../admin/adm_tldadd.php:71
 #: ../admin/adm_tldedit.php:70 ../admin/bro_pref.php:150
-#: ../admin/browseforfolder2.php:149 ../admin/ftp_del.php:83
+#: ../admin/browseforfolder2.php:150 ../admin/ftp_del.php:83
 #: ../admin/ftp_edit.php:99 ../admin/hta_adduser.php:68
 #: ../admin/hta_dodeluser.php:65 ../admin/hta_edit.php:115
 #: ../admin/mail_edit.php:116 ../admin/mail_manage_catchall.php:137
@@ -357,11 +357,11 @@ msgid ""
 "alternc.install"
 msgstr ""
 
-#: ../admin/adm_deactivate.php:46 ../class/m_admin.php:246
-#: ../class/m_admin.php:278 ../class/m_admin.php:796 ../class/m_admin.php:824
-#: ../class/m_admin.php:853 ../class/m_admin.php:906 ../class/m_admin.php:935
-#: ../class/m_admin.php:962 ../class/m_admin.php:1042
-#: ../class/m_admin.php:1066
+#: ../admin/adm_deactivate.php:46 ../class/m_admin.php:241
+#: ../class/m_admin.php:272 ../class/m_admin.php:780 ../class/m_admin.php:806
+#: ../class/m_admin.php:833 ../class/m_admin.php:886 ../class/m_admin.php:914
+#: ../class/m_admin.php:940 ../class/m_admin.php:1017
+#: ../class/m_admin.php:1041
 msgid "Account not found"
 msgstr ""
 
@@ -1092,7 +1092,7 @@ msgstr ""
 msgid "Add this account to the allowed list"
 msgstr ""
 
-#: ../admin/adm_panel.php:40 ../class/m_admin.php:107
+#: ../admin/adm_panel.php:40 ../class/m_admin.php:108
 msgid "Admin Control Panel"
 msgstr ""
 
@@ -1702,19 +1702,19 @@ msgstr ""
 msgid "Change my settings"
 msgstr ""
 
-#: ../admin/browseforfolder2.php:127
+#: ../admin/browseforfolder2.php:128
 msgid "Searching for a folder"
 msgstr ""
 
-#: ../admin/browseforfolder2.php:133
+#: ../admin/browseforfolder2.php:134
 msgid "Error, cannot find this folder"
 msgstr ""
 
-#: ../admin/browseforfolder2.php:135
+#: ../admin/browseforfolder2.php:136
 msgid "Back to the root folder"
 msgstr ""
 
-#: ../admin/browseforfolder2.php:148
+#: ../admin/browseforfolder2.php:149
 msgid "Select"
 msgstr ""
 
@@ -2244,7 +2244,7 @@ msgstr ""
 msgid "Password do not match"
 msgstr ""
 
-#: ../admin/ftp_edit.php:121 ../class/m_admin.php:1472 ../class/m_hta.php:292
+#: ../admin/ftp_edit.php:121 ../class/m_admin.php:1443 ../class/m_hta.php:292
 msgid "Please enter a password"
 msgstr ""
 
@@ -3910,15 +3910,15 @@ msgstr ""
 msgid "Domain can be installed, force NO DNS hosting"
 msgstr ""
 
-#: ../class/m_admin.php:84
+#: ../class/m_admin.php:86
 msgid "Administration"
 msgstr ""
 
-#: ../class/m_admin.php:92
+#: ../class/m_admin.php:94
 msgid "Manage AlternC accounts"
 msgstr ""
 
-#: ../class/m_admin.php:97
+#: ../class/m_admin.php:99
 msgid "User Quotas"
 msgstr ""
 
@@ -3926,156 +3926,163 @@ msgstr ""
 msgid "PhpMyAdmin"
 msgstr ""
 
-#: ../class/m_admin.php:120
+#: ../class/m_admin.php:119
 msgid "Switch debug Off"
 msgstr ""
 
-#: ../class/m_admin.php:120
+#: ../class/m_admin.php:119
 msgid "Switch debug On"
 msgstr ""
 
-#: ../class/m_admin.php:127
+#: ../class/m_admin.php:125
 msgid "Applying..."
 msgstr ""
 
-#: ../class/m_admin.php:128
+#: ../class/m_admin.php:126
 msgid "Domain changes are already applying"
 msgstr ""
 
-#: ../class/m_admin.php:134
+#: ../class/m_admin.php:131
 msgid "Apply changes"
 msgstr ""
 
-#: ../class/m_admin.php:137
+#: ../class/m_admin.php:134
 msgid ""
 "Server configuration changes are applied every 5 minutes. Do you want to do "
 "it right now?"
 msgstr ""
 
-#: ../class/m_admin.php:212 ../class/m_admin.php:268 ../class/m_admin.php:342
-#: ../class/m_admin.php:431 ../class/m_admin.php:477 ../class/m_admin.php:513
-#: ../class/m_admin.php:595 ../class/m_admin.php:773 ../class/m_admin.php:816
-#: ../class/m_admin.php:845 ../class/m_admin.php:880
+#: ../class/m_admin.php:207 ../class/m_admin.php:262 ../class/m_admin.php:334
+#: ../class/m_admin.php:417 ../class/m_admin.php:462 ../class/m_admin.php:498
+#: ../class/m_admin.php:581 ../class/m_admin.php:759 ../class/m_admin.php:799
+#: ../class/m_admin.php:826 ../class/m_admin.php:860
 msgid "-- Only administrators can access this page! --"
 msgstr ""
 
-#: ../class/m_admin.php:383
+#: ../class/m_admin.php:373
 msgid ""
 "Invalid pattern type provided. Are you even performing a legitimate action?"
 msgstr ""
 
-#: ../class/m_admin.php:439
+#: ../class/m_admin.php:425
 msgid "Subject, message and sender are mandatory"
 msgstr ""
 
-#: ../class/m_admin.php:444
+#: ../class/m_admin.php:430
 msgid "Sender is syntaxically incorrect"
 msgstr ""
 
-#: ../class/m_admin.php:536
+#: ../class/m_admin.php:521
 msgid "-- Only administrators can do that! --"
 msgstr ""
 
-#: ../class/m_admin.php:542
+#: ../class/m_admin.php:527
 msgid "You don't seem to be allowed to delegate this domain"
 msgstr ""
 
-#: ../class/m_admin.php:599
+#: ../class/m_admin.php:585
 msgid "Missing db_server field"
 msgstr ""
 
-#: ../class/m_admin.php:603 ../class/m_admin.php:608
+#: ../class/m_admin.php:589 ../class/m_admin.php:594
 msgid "All fields are mandatory"
 msgstr ""
 
-#: ../class/m_admin.php:613
+#: ../class/m_admin.php:599
 msgid "Please enter a valid email address"
 msgstr ""
 
-#: ../class/m_admin.php:619
+#: ../class/m_admin.php:605
 msgid "Login can only contains characters a-z and 0-9"
 msgstr ""
 
-#: ../class/m_admin.php:626
+#: ../class/m_admin.php:612
 msgid "The login is too long (14 chars max)"
 msgstr ""
 
-#: ../class/m_admin.php:631
+#: ../class/m_admin.php:617
 msgid "Login can only contains characters a-z, 0-9 and -"
 msgstr ""
 
-#: ../class/m_admin.php:676
+#: ../class/m_admin.php:663
 msgid "This login already exists"
 msgstr ""
 
-#: ../class/m_admin.php:699
+#: ../class/m_admin.php:686
 #, php-format
 msgid "query failed: %s "
 msgstr ""
 
-#: ../class/m_admin.php:726
+#: ../class/m_admin.php:713
 #, php-format
 msgid "New account %s from %s on %s"
 msgstr ""
 
-#: ../class/m_admin.php:731
+#: ../class/m_admin.php:718
 #, php-format
 msgid "Cannot send email to %s"
 msgstr ""
 
-#: ../class/m_admin.php:735
+#: ../class/m_admin.php:722
 #, php-format
 msgid "Query failed: %s"
 msgstr ""
 
-#: ../class/m_admin.php:1046
+#: ../class/m_admin.php:1021
 msgid "This account is ALREADY an administrator account"
 msgstr ""
 
-#: ../class/m_admin.php:1070
+#: ../class/m_admin.php:1045
 msgid "This account is NOT an administrator account!"
 msgstr ""
 
-#: ../class/m_admin.php:1233
+#: ../class/m_admin.php:1208
 #, php-format
 msgid "Domain '%s' not found."
 msgstr ""
 
-#: ../class/m_admin.php:1253 ../class/m_admin.php:1289
-#: ../class/m_admin.php:1347
+#: ../class/m_admin.php:1227 ../class/m_admin.php:1262
+#: ../class/m_admin.php:1321
 msgid "This TLD does not exist"
 msgstr ""
 
-#: ../class/m_admin.php:1314
+#: ../class/m_admin.php:1287
 msgid "The TLD name is mandatory"
 msgstr ""
 
-#: ../class/m_admin.php:1321
+#: ../class/m_admin.php:1294
 msgid "This TLD already exist"
 msgstr ""
 
-#: ../class/m_admin.php:1468
+#: ../class/m_admin.php:1439
 msgid "Please enter a login"
 msgstr ""
 
-#: ../class/m_admin.php:1478
+#: ../class/m_admin.php:1449
 msgid "-- Program error -- The requested password policy does not exist!"
 msgstr ""
 
-#: ../class/m_admin.php:1486
+#: ../class/m_admin.php:1457
 msgid "The password length is too short according to the password policy"
 msgstr ""
 
-#: ../class/m_admin.php:1491
+#: ../class/m_admin.php:1462
 msgid "The password is too long according to the password policy"
 msgstr ""
 
-#: ../class/m_admin.php:1501
+#: ../class/m_admin.php:1472
 msgid ""
-"The password policy prevents you to use your login name inside your password"
+"The password policy prevents you to use your login name inside your password "
+"or the other way around"
 msgstr ""
 
-#: ../class/m_admin.php:1525
+#: ../class/m_admin.php:1477
+msgid ""
+"The password policy prevents you to use something too similar from your "
+"login name inside your password"
+msgstr ""
+
+#: ../class/m_admin.php:1501
 msgid ""
 "Your password contains not enough different classes of character, between "
 "low-case, up-case, figures and special characters."
diff --git a/bureau/locales/nl_NL/LC_MESSAGES/messages.po b/bureau/locales/nl_NL/LC_MESSAGES/messages.po
index de43d4f9..ef0b310c 100644
--- a/bureau/locales/nl_NL/LC_MESSAGES/messages.po
+++ b/bureau/locales/nl_NL/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: i18n@alternc.org\n"
-"POT-Creation-Date: 2015-05-12 15:54+0200\n"
+"POT-Creation-Date: 2015-06-16 14:09+0200\n"
 "PO-Revision-Date: 2012-10-17 09:52+0200\n"
 "Last-Translator: Benjamin Sonntag <benjamin@sonntag.fr>\n"
 "Language-Team: Dutch <team@alternc.org>\n"
@@ -225,7 +225,7 @@ msgstr ""
 #: ../admin/adm_domstypeedit.php:134 ../admin/adm_edit.php:124
 #: ../admin/adm_quotaedit.php:88 ../admin/adm_tldadd.php:71
 #: ../admin/adm_tldedit.php:70 ../admin/bro_pref.php:150
-#: ../admin/browseforfolder2.php:149 ../admin/ftp_del.php:83
+#: ../admin/browseforfolder2.php:150 ../admin/ftp_del.php:83
 #: ../admin/ftp_edit.php:99 ../admin/hta_adduser.php:68
 #: ../admin/hta_dodeluser.php:65 ../admin/hta_edit.php:115
 #: ../admin/mail_edit.php:116 ../admin/mail_manage_catchall.php:137
@@ -357,11 +357,11 @@ msgid ""
 "alternc.install"
 msgstr ""
 
-#: ../admin/adm_deactivate.php:46 ../class/m_admin.php:246
-#: ../class/m_admin.php:278 ../class/m_admin.php:796 ../class/m_admin.php:824
-#: ../class/m_admin.php:853 ../class/m_admin.php:906 ../class/m_admin.php:935
-#: ../class/m_admin.php:962 ../class/m_admin.php:1042
-#: ../class/m_admin.php:1066
+#: ../admin/adm_deactivate.php:46 ../class/m_admin.php:241
+#: ../class/m_admin.php:272 ../class/m_admin.php:780 ../class/m_admin.php:806
+#: ../class/m_admin.php:833 ../class/m_admin.php:886 ../class/m_admin.php:914
+#: ../class/m_admin.php:940 ../class/m_admin.php:1017
+#: ../class/m_admin.php:1041
 msgid "Account not found"
 msgstr ""
 
@@ -1092,7 +1092,7 @@ msgstr ""
 msgid "Add this account to the allowed list"
 msgstr ""
 
-#: ../admin/adm_panel.php:40 ../class/m_admin.php:107
+#: ../admin/adm_panel.php:40 ../class/m_admin.php:108
 msgid "Admin Control Panel"
 msgstr ""
 
@@ -1702,19 +1702,19 @@ msgstr ""
 msgid "Change my settings"
 msgstr ""
 
-#: ../admin/browseforfolder2.php:127
+#: ../admin/browseforfolder2.php:128
 msgid "Searching for a folder"
 msgstr ""
 
-#: ../admin/browseforfolder2.php:133
+#: ../admin/browseforfolder2.php:134
 msgid "Error, cannot find this folder"
 msgstr ""
 
-#: ../admin/browseforfolder2.php:135
+#: ../admin/browseforfolder2.php:136
 msgid "Back to the root folder"
 msgstr ""
 
-#: ../admin/browseforfolder2.php:148
+#: ../admin/browseforfolder2.php:149
 msgid "Select"
 msgstr ""
 
@@ -2244,7 +2244,7 @@ msgstr ""
 msgid "Password do not match"
 msgstr ""
 
-#: ../admin/ftp_edit.php:121 ../class/m_admin.php:1472 ../class/m_hta.php:292
+#: ../admin/ftp_edit.php:121 ../class/m_admin.php:1443 ../class/m_hta.php:292
 msgid "Please enter a password"
 msgstr ""
 
@@ -3910,15 +3910,15 @@ msgstr ""
 msgid "Domain can be installed, force NO DNS hosting"
 msgstr ""
 
-#: ../class/m_admin.php:84
+#: ../class/m_admin.php:86
 msgid "Administration"
 msgstr ""
 
-#: ../class/m_admin.php:92
+#: ../class/m_admin.php:94
 msgid "Manage AlternC accounts"
 msgstr ""
 
-#: ../class/m_admin.php:97
+#: ../class/m_admin.php:99
 msgid "User Quotas"
 msgstr ""
 
@@ -3926,156 +3926,163 @@ msgstr ""
 msgid "PhpMyAdmin"
 msgstr ""
 
-#: ../class/m_admin.php:120
+#: ../class/m_admin.php:119
 msgid "Switch debug Off"
 msgstr ""
 
-#: ../class/m_admin.php:120
+#: ../class/m_admin.php:119
 msgid "Switch debug On"
 msgstr ""
 
-#: ../class/m_admin.php:127
+#: ../class/m_admin.php:125
 msgid "Applying..."
 msgstr ""
 
-#: ../class/m_admin.php:128
+#: ../class/m_admin.php:126
 msgid "Domain changes are already applying"
 msgstr ""
 
-#: ../class/m_admin.php:134
+#: ../class/m_admin.php:131
 msgid "Apply changes"
 msgstr ""
 
-#: ../class/m_admin.php:137
+#: ../class/m_admin.php:134
 msgid ""
 "Server configuration changes are applied every 5 minutes. Do you want to do "
 "it right now?"
 msgstr ""
 
-#: ../class/m_admin.php:212 ../class/m_admin.php:268 ../class/m_admin.php:342
-#: ../class/m_admin.php:431 ../class/m_admin.php:477 ../class/m_admin.php:513
-#: ../class/m_admin.php:595 ../class/m_admin.php:773 ../class/m_admin.php:816
-#: ../class/m_admin.php:845 ../class/m_admin.php:880
+#: ../class/m_admin.php:207 ../class/m_admin.php:262 ../class/m_admin.php:334
+#: ../class/m_admin.php:417 ../class/m_admin.php:462 ../class/m_admin.php:498
+#: ../class/m_admin.php:581 ../class/m_admin.php:759 ../class/m_admin.php:799
+#: ../class/m_admin.php:826 ../class/m_admin.php:860
 msgid "-- Only administrators can access this page! --"
 msgstr ""
 
-#: ../class/m_admin.php:383
+#: ../class/m_admin.php:373
 msgid ""
 "Invalid pattern type provided. Are you even performing a legitimate action?"
 msgstr ""
 
-#: ../class/m_admin.php:439
+#: ../class/m_admin.php:425
 msgid "Subject, message and sender are mandatory"
 msgstr ""
 
-#: ../class/m_admin.php:444
+#: ../class/m_admin.php:430
 msgid "Sender is syntaxically incorrect"
 msgstr ""
 
-#: ../class/m_admin.php:536
+#: ../class/m_admin.php:521
 msgid "-- Only administrators can do that! --"
 msgstr ""
 
-#: ../class/m_admin.php:542
+#: ../class/m_admin.php:527
 msgid "You don't seem to be allowed to delegate this domain"
 msgstr ""
 
-#: ../class/m_admin.php:599
+#: ../class/m_admin.php:585
 msgid "Missing db_server field"
 msgstr ""
 
-#: ../class/m_admin.php:603 ../class/m_admin.php:608
+#: ../class/m_admin.php:589 ../class/m_admin.php:594
 msgid "All fields are mandatory"
 msgstr ""
 
-#: ../class/m_admin.php:613
+#: ../class/m_admin.php:599
 msgid "Please enter a valid email address"
 msgstr ""
 
-#: ../class/m_admin.php:619
+#: ../class/m_admin.php:605
 msgid "Login can only contains characters a-z and 0-9"
 msgstr ""
 
-#: ../class/m_admin.php:626
+#: ../class/m_admin.php:612
 msgid "The login is too long (14 chars max)"
 msgstr ""
 
-#: ../class/m_admin.php:631
+#: ../class/m_admin.php:617
 msgid "Login can only contains characters a-z, 0-9 and -"
 msgstr ""
 
-#: ../class/m_admin.php:676
+#: ../class/m_admin.php:663
 msgid "This login already exists"
 msgstr ""
 
-#: ../class/m_admin.php:699
+#: ../class/m_admin.php:686
 #, php-format
 msgid "query failed: %s "
 msgstr ""
 
-#: ../class/m_admin.php:726
+#: ../class/m_admin.php:713
 #, php-format
 msgid "New account %s from %s on %s"
 msgstr ""
 
-#: ../class/m_admin.php:731
+#: ../class/m_admin.php:718
 #, php-format
 msgid "Cannot send email to %s"
 msgstr ""
 
-#: ../class/m_admin.php:735
+#: ../class/m_admin.php:722
 #, php-format
 msgid "Query failed: %s"
 msgstr ""
 
-#: ../class/m_admin.php:1046
+#: ../class/m_admin.php:1021
 msgid "This account is ALREADY an administrator account"
 msgstr ""
 
-#: ../class/m_admin.php:1070
+#: ../class/m_admin.php:1045
 msgid "This account is NOT an administrator account!"
 msgstr ""
 
-#: ../class/m_admin.php:1233
+#: ../class/m_admin.php:1208
 #, php-format
 msgid "Domain '%s' not found."
 msgstr ""
 
-#: ../class/m_admin.php:1253 ../class/m_admin.php:1289
-#: ../class/m_admin.php:1347
+#: ../class/m_admin.php:1227 ../class/m_admin.php:1262
+#: ../class/m_admin.php:1321
 msgid "This TLD does not exist"
 msgstr ""
 
-#: ../class/m_admin.php:1314
+#: ../class/m_admin.php:1287
 msgid "The TLD name is mandatory"
 msgstr ""
 
-#: ../class/m_admin.php:1321
+#: ../class/m_admin.php:1294
 msgid "This TLD already exist"
 msgstr ""
 
-#: ../class/m_admin.php:1468
+#: ../class/m_admin.php:1439
 msgid "Please enter a login"
 msgstr ""
 
-#: ../class/m_admin.php:1478
+#: ../class/m_admin.php:1449
 msgid "-- Program error -- The requested password policy does not exist!"
 msgstr ""
 
-#: ../class/m_admin.php:1486
+#: ../class/m_admin.php:1457
 msgid "The password length is too short according to the password policy"
 msgstr ""
 
-#: ../class/m_admin.php:1491
+#: ../class/m_admin.php:1462
 msgid "The password is too long according to the password policy"
 msgstr ""
 
-#: ../class/m_admin.php:1501
+#: ../class/m_admin.php:1472
 msgid ""
-"The password policy prevents you to use your login name inside your password"
+"The password policy prevents you to use your login name inside your password "
+"or the other way around"
 msgstr ""
 
-#: ../class/m_admin.php:1525
+#: ../class/m_admin.php:1477
+msgid ""
+"The password policy prevents you to use something too similar from your "
+"login name inside your password"
+msgstr ""
+
+#: ../class/m_admin.php:1501
 msgid ""
 "Your password contains not enough different classes of character, between "
 "low-case, up-case, figures and special characters."
diff --git a/bureau/locales/pt_BR/LC_MESSAGES/messages.po b/bureau/locales/pt_BR/LC_MESSAGES/messages.po
index a0750cc6..4476d0f3 100644
--- a/bureau/locales/pt_BR/LC_MESSAGES/messages.po
+++ b/bureau/locales/pt_BR/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: $Id: admin.po,v 1.2 2003/06/09 14:36:08 root Exp $\n"
 "Report-Msgid-Bugs-To: i18n@alternc.org\n"
-"POT-Creation-Date: 2015-05-12 15:54+0200\n"
+"POT-Creation-Date: 2015-06-16 14:09+0200\n"
 "PO-Revision-Date: 2007-10-25 23:50-0400\n"
 "Last-Translator: Benjamin Sonntag <benjamin@alternc.org>\n"
 "Language-Team: English <i18n@alternc.org>\n"
@@ -239,7 +239,7 @@ msgstr "Criar está nova conta FTP."
 #: ../admin/adm_domstypeedit.php:134 ../admin/adm_edit.php:124
 #: ../admin/adm_quotaedit.php:88 ../admin/adm_tldadd.php:71
 #: ../admin/adm_tldedit.php:70 ../admin/bro_pref.php:150
-#: ../admin/browseforfolder2.php:149 ../admin/ftp_del.php:83
+#: ../admin/browseforfolder2.php:150 ../admin/ftp_del.php:83
 #: ../admin/ftp_edit.php:99 ../admin/hta_adduser.php:68
 #: ../admin/hta_dodeluser.php:65 ../admin/hta_edit.php:115
 #: ../admin/mail_edit.php:116 ../admin/mail_manage_catchall.php:137
@@ -377,11 +377,11 @@ msgid ""
 "alternc.install"
 msgstr ""
 
-#: ../admin/adm_deactivate.php:46 ../class/m_admin.php:246
-#: ../class/m_admin.php:278 ../class/m_admin.php:796 ../class/m_admin.php:824
-#: ../class/m_admin.php:853 ../class/m_admin.php:906 ../class/m_admin.php:935
-#: ../class/m_admin.php:962 ../class/m_admin.php:1042
-#: ../class/m_admin.php:1066
+#: ../admin/adm_deactivate.php:46 ../class/m_admin.php:241
+#: ../class/m_admin.php:272 ../class/m_admin.php:780 ../class/m_admin.php:806
+#: ../class/m_admin.php:833 ../class/m_admin.php:886 ../class/m_admin.php:914
+#: ../class/m_admin.php:940 ../class/m_admin.php:1017
+#: ../class/m_admin.php:1041
 #, fuzzy
 msgid "Account not found"
 msgstr "Conta Permitiu ?"
@@ -1170,7 +1170,7 @@ msgstr ""
 msgid "Add this account to the allowed list"
 msgstr ""
 
-#: ../admin/adm_panel.php:40 ../class/m_admin.php:107
+#: ../admin/adm_panel.php:40 ../class/m_admin.php:108
 msgid "Admin Control Panel"
 msgstr "Painel de controle do Administrador"
 
@@ -1819,21 +1819,21 @@ msgstr "Recordar o último diretório visitado?"
 msgid "Change my settings"
 msgstr "Mudar meus ajustes"
 
-#: ../admin/browseforfolder2.php:127
+#: ../admin/browseforfolder2.php:128
 msgid "Searching for a folder"
 msgstr ""
 
-#: ../admin/browseforfolder2.php:133
+#: ../admin/browseforfolder2.php:134
 #, fuzzy
 msgid "Error, cannot find this folder"
 msgstr "Protect this folder"
 
-#: ../admin/browseforfolder2.php:135
+#: ../admin/browseforfolder2.php:136
 #, fuzzy
 msgid "Back to the root folder"
 msgstr "Volta ao navegador de arquivos"
 
-#: ../admin/browseforfolder2.php:148
+#: ../admin/browseforfolder2.php:149
 #, fuzzy
 msgid "Select"
 msgstr "Suprimir"
@@ -2403,7 +2403,7 @@ msgstr "Please enter a password"
 msgid "Password do not match"
 msgstr "Senha"
 
-#: ../admin/ftp_edit.php:121 ../class/m_admin.php:1472 ../class/m_hta.php:292
+#: ../admin/ftp_edit.php:121 ../class/m_admin.php:1443 ../class/m_hta.php:292
 msgid "Please enter a password"
 msgstr "Please enter a password"
 
@@ -4214,17 +4214,17 @@ msgstr "O domínio pode ser instalado, mas não faz nenhuma verificação"
 msgid "Domain can be installed, force NO DNS hosting"
 msgstr "O domínio pode ser instalado, forçã a hospedadem SEM DNS"
 
-#: ../class/m_admin.php:84
+#: ../class/m_admin.php:86
 #, fuzzy
 msgid "Administration"
 msgstr "Administração do"
 
-#: ../class/m_admin.php:92
+#: ../class/m_admin.php:94
 #, fuzzy
 msgid "Manage AlternC accounts"
 msgstr "Mudar o email da sua conta"
 
-#: ../class/m_admin.php:97
+#: ../class/m_admin.php:99
 #, fuzzy
 msgid "User Quotas"
 msgstr "Quotas"
@@ -4233,164 +4233,171 @@ msgstr "Quotas"
 msgid "PhpMyAdmin"
 msgstr ""
 
-#: ../class/m_admin.php:120
+#: ../class/m_admin.php:119
 msgid "Switch debug Off"
 msgstr ""
 
-#: ../class/m_admin.php:120
+#: ../class/m_admin.php:119
 msgid "Switch debug On"
 msgstr ""
 
-#: ../class/m_admin.php:127
+#: ../class/m_admin.php:125
 #, fuzzy
 msgid "Applying..."
 msgstr "Suprimando o secundário-domínio %s"
 
-#: ../class/m_admin.php:128
+#: ../class/m_admin.php:126
 msgid "Domain changes are already applying"
 msgstr ""
 
-#: ../class/m_admin.php:134
+#: ../class/m_admin.php:131
 #, fuzzy
 msgid "Apply changes"
 msgstr "Senha"
 
-#: ../class/m_admin.php:137
+#: ../class/m_admin.php:134
 msgid ""
 "Server configuration changes are applied every 5 minutes. Do you want to do "
 "it right now?"
 msgstr ""
 
-#: ../class/m_admin.php:212 ../class/m_admin.php:268 ../class/m_admin.php:342
-#: ../class/m_admin.php:431 ../class/m_admin.php:477 ../class/m_admin.php:513
-#: ../class/m_admin.php:595 ../class/m_admin.php:773 ../class/m_admin.php:816
-#: ../class/m_admin.php:845 ../class/m_admin.php:880
+#: ../class/m_admin.php:207 ../class/m_admin.php:262 ../class/m_admin.php:334
+#: ../class/m_admin.php:417 ../class/m_admin.php:462 ../class/m_admin.php:498
+#: ../class/m_admin.php:581 ../class/m_admin.php:759 ../class/m_admin.php:799
+#: ../class/m_admin.php:826 ../class/m_admin.php:860
 msgid "-- Only administrators can access this page! --"
 msgstr ""
 
-#: ../class/m_admin.php:383
+#: ../class/m_admin.php:373
 msgid ""
 "Invalid pattern type provided. Are you even performing a legitimate action?"
 msgstr ""
 
-#: ../class/m_admin.php:439
+#: ../class/m_admin.php:425
 msgid "Subject, message and sender are mandatory"
 msgstr ""
 
-#: ../class/m_admin.php:444
+#: ../class/m_admin.php:430
 msgid "Sender is syntaxically incorrect"
 msgstr ""
 
-#: ../class/m_admin.php:536
+#: ../class/m_admin.php:521
 msgid "-- Only administrators can do that! --"
 msgstr ""
 
-#: ../class/m_admin.php:542
+#: ../class/m_admin.php:527
 #, fuzzy
 msgid "You don't seem to be allowed to delegate this domain"
 msgstr "Confirma o apagamento deste domínio %s"
 
-#: ../class/m_admin.php:599
+#: ../class/m_admin.php:585
 msgid "Missing db_server field"
 msgstr ""
 
-#: ../class/m_admin.php:603 ../class/m_admin.php:608
+#: ../class/m_admin.php:589 ../class/m_admin.php:594
 msgid "All fields are mandatory"
 msgstr ""
 
-#: ../class/m_admin.php:613
+#: ../class/m_admin.php:599
 #, fuzzy
 msgid "Please enter a valid email address"
 msgstr "Criar uma caixa de email"
 
-#: ../class/m_admin.php:619
+#: ../class/m_admin.php:605
 msgid "Login can only contains characters a-z and 0-9"
 msgstr ""
 
-#: ../class/m_admin.php:626
+#: ../class/m_admin.php:612
 msgid "The login is too long (14 chars max)"
 msgstr ""
 
-#: ../class/m_admin.php:631
+#: ../class/m_admin.php:617
 msgid "Login can only contains characters a-z, 0-9 and -"
 msgstr ""
 
-#: ../class/m_admin.php:676
+#: ../class/m_admin.php:663
 msgid "This login already exists"
 msgstr ""
 
-#: ../class/m_admin.php:699
+#: ../class/m_admin.php:686
 #, php-format
 msgid "query failed: %s "
 msgstr ""
 
-#: ../class/m_admin.php:726
+#: ../class/m_admin.php:713
 #, php-format
 msgid "New account %s from %s on %s"
 msgstr ""
 
-#: ../class/m_admin.php:731
+#: ../class/m_admin.php:718
 #, php-format
 msgid "Cannot send email to %s"
 msgstr ""
 
-#: ../class/m_admin.php:735
+#: ../class/m_admin.php:722
 #, php-format
 msgid "Query failed: %s"
 msgstr ""
 
-#: ../class/m_admin.php:1046
+#: ../class/m_admin.php:1021
 #, fuzzy
 msgid "This account is ALREADY an administrator account"
 msgstr "Esta conta é uma conta super-administrador"
 
-#: ../class/m_admin.php:1070
+#: ../class/m_admin.php:1045
 #, fuzzy
 msgid "This account is NOT an administrator account!"
 msgstr "Esta conta é uma conta super-administrador"
 
-#: ../class/m_admin.php:1233
+#: ../class/m_admin.php:1208
 #, fuzzy, php-format
 msgid "Domain '%s' not found."
 msgstr "Domínio %s suprimido"
 
-#: ../class/m_admin.php:1253 ../class/m_admin.php:1289
-#: ../class/m_admin.php:1347
+#: ../class/m_admin.php:1227 ../class/m_admin.php:1262
+#: ../class/m_admin.php:1321
 #, fuzzy
 msgid "This TLD does not exist"
 msgstr "Membro '%s' não existe"
 
-#: ../class/m_admin.php:1314
+#: ../class/m_admin.php:1287
 msgid "The TLD name is mandatory"
 msgstr ""
 
-#: ../class/m_admin.php:1321
+#: ../class/m_admin.php:1294
 msgid "This TLD already exist"
 msgstr ""
 
-#: ../class/m_admin.php:1468
+#: ../class/m_admin.php:1439
 #, fuzzy
 msgid "Please enter a login"
 msgstr "Please enter a password"
 
-#: ../class/m_admin.php:1478
+#: ../class/m_admin.php:1449
 msgid "-- Program error -- The requested password policy does not exist!"
 msgstr ""
 
-#: ../class/m_admin.php:1486
+#: ../class/m_admin.php:1457
 msgid "The password length is too short according to the password policy"
 msgstr ""
 
-#: ../class/m_admin.php:1491
+#: ../class/m_admin.php:1462
 msgid "The password is too long according to the password policy"
 msgstr ""
 
-#: ../class/m_admin.php:1501
+#: ../class/m_admin.php:1472
 msgid ""
-"The password policy prevents you to use your login name inside your password"
+"The password policy prevents you to use your login name inside your password "
+"or the other way around"
 msgstr ""
 
-#: ../class/m_admin.php:1525
+#: ../class/m_admin.php:1477
+msgid ""
+"The password policy prevents you to use something too similar from your "
+"login name inside your password"
+msgstr ""
+
+#: ../class/m_admin.php:1501
 msgid ""
 "Your password contains not enough different classes of character, between "
 "low-case, up-case, figures and special characters."
@@ -5498,4 +5505,3 @@ msgstr ""
 #: ../class/mime.php:172 ../class/mime.php:173 ../class/mime.php:174
 msgid "Real Media File"
 msgstr ""
-