diff --git a/locale/ar/fusiondirectory.po b/locale/ar/fusiondirectory.po
index 6011bb27de40dc25f857c0fc29034a158281dd65..4f42591f4c1baf01096e35eee0db3d0273f2bdd4 100644
--- a/locale/ar/fusiondirectory.po
+++ b/locale/ar/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-10 13:25+0200\n"
-"PO-Revision-Date: 2016-06-03 11:03+0000\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
+"PO-Revision-Date: 2016-06-25 10:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -144,7 +144,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_group.inc:73
 #: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:414
 msgid "GID"
 msgstr ""
 
@@ -201,11 +201,10 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467 include/functions.inc:799
+#: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:520 html/class_passwordRecovery.inc:169
-#: setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -217,7 +216,7 @@ msgid "Warning"
 msgstr "ØªØØ°ÙŠØ±"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
@@ -562,7 +561,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr ""
 
@@ -933,7 +932,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1151,8 +1150,8 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:654
-#: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:32
 msgid "New password"
 msgstr ""
 
@@ -1337,11 +1336,11 @@ msgstr ""
 msgid "password not changeable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:408
+#: plugins/personal/posix/class_posixAccount.inc:411
 msgid "UID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:530
 #, php-format
 msgid "Group of user %s"
 msgstr ""
@@ -1583,7 +1582,7 @@ msgid "Session lifetime"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:207
-msgid "Defines when a session will expire in seconds."
+msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:212
@@ -2164,7 +2163,7 @@ msgstr ""
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:790
-#: include/class_plugin.inc:1518 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1521 include/class_CopyPasteHandler.inc:276
 #: include/simpleplugin/class_attribute.inc:1571
 #: include/simpleplugin/class_attribute.inc:1574
 #: include/simpleplugin/class_attribute.inc:1577
@@ -2177,7 +2176,7 @@ msgstr ""
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:471 html/index.php:481
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2301,7 +2300,7 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr ""
 
@@ -2323,7 +2322,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:367 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3415,7 +3414,7 @@ msgid ""
 "\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
 msgstr ""
 
-#: include/class_plugin.inc:1316
+#: include/class_plugin.inc:1319
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3525,39 +3524,39 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:260
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:261
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:262
+#: include/simpleplugin/class_helpersAttribute.inc:266
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_helpersAttribute.inc:267
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:275
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:276
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:277
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
@@ -3740,127 +3739,132 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:172
+#: html/index.php:171
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:174
+#: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:209
+#: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:212
+#: html/index.php:211
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:214
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:218
+#: html/index.php:217
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:279
+#: html/index.php:278
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:301
+#: html/index.php:300
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:331
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:473
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:483
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:520
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr ""
 
-#: html/main.php:113
+#: html/main.php:115
 msgid "PHP configuration"
 msgstr ""
 
-#: html/main.php:114
+#: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Password change"
 msgstr ""
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:205
+#: html/main.php:158
+msgid "Your password has expired, please set a new one."
+msgstr ""
+
+#: html/main.php:208
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:248
+#: html/main.php:251
 msgid "User ACL checks disabled"
 msgstr ""
 
-#: html/main.php:286
+#: html/main.php:289
 msgid "Plugin"
 msgstr ""
 
-#: html/main.php:287
+#: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
 msgstr ""
 
-#: html/main.php:302
+#: html/main.php:305
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:303
+#: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
@@ -3877,52 +3881,44 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr ""
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr ""
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:68
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4523,15 +4519,15 @@ msgid ""
 "'Off'."
 msgstr ""
 
-#: setup/class_setup.inc:127
+#: setup/class_setup.inc:122
 msgid "Setup error"
 msgstr ""
 
-#: setup/class_setup.inc:207
+#: setup/class_setup.inc:202
 msgid "Completed"
 msgstr ""
 
-#: setup/class_setup.inc:250
+#: setup/class_setup.inc:245
 msgid "Next"
 msgstr ""
 
@@ -4808,72 +4804,78 @@ msgstr ""
 msgid "Set"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
+#: ihtml/themes/default/recovery.tpl.c:8
+msgid "Lost password"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:11
-msgid "Lost password"
+msgid ""
+"Informations to reset password for %1 have been sent to email address %2"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:14
+msgid "Warning : this email is only valid for %1 minutes."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:17
 #: ihtml/themes/default/recovery.tpl.c:20
-#: ihtml/themes/default/recovery.tpl.c:62
-#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:32
 #: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:41
-#: ihtml/themes/default/recovery.tpl.c:74
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:44
-#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/recovery.tpl.c:53
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
+"=> Use your e-mail in the long format, e.g : John Doe => "
+"john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:71
-msgid "Mail"
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
diff --git a/locale/ca/fusiondirectory.po b/locale/ca/fusiondirectory.po
index 9aeefe2b91c9db26e203f235b2a433ea108276d3..537d2a0dc99fb2ac427c07025e1f320eac76ac39 100644
--- a/locale/ca/fusiondirectory.po
+++ b/locale/ca/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-10 13:25+0200\n"
-"PO-Revision-Date: 2016-06-03 11:03+0000\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
+"PO-Revision-Date: 2016-06-25 10:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -144,7 +144,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_group.inc:73
 #: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:414
 msgid "GID"
 msgstr ""
 
@@ -201,11 +201,10 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467 include/functions.inc:799
+#: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:520 html/class_passwordRecovery.inc:169
-#: setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -217,7 +216,7 @@ msgid "Warning"
 msgstr "AvÃs"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
@@ -562,7 +561,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr "Entrada"
 
@@ -933,7 +932,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1151,8 +1150,8 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:654
-#: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:32
 msgid "New password"
 msgstr "Contrasenya nova"
 
@@ -1337,11 +1336,11 @@ msgstr ""
 msgid "password not changeable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:408
+#: plugins/personal/posix/class_posixAccount.inc:411
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:530
 #, php-format
 msgid "Group of user %s"
 msgstr ""
@@ -1583,7 +1582,7 @@ msgid "Session lifetime"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:207
-msgid "Defines when a session will expire in seconds."
+msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:212
@@ -2164,7 +2163,7 @@ msgstr ""
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:790
-#: include/class_plugin.inc:1518 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1521 include/class_CopyPasteHandler.inc:276
 #: include/simpleplugin/class_attribute.inc:1571
 #: include/simpleplugin/class_attribute.inc:1574
 #: include/simpleplugin/class_attribute.inc:1577
@@ -2177,7 +2176,7 @@ msgstr ""
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:471 html/index.php:481
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2301,7 +2300,7 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr "Error de la configuraciÃ³"
 
@@ -2323,7 +2322,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:367 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3415,7 +3414,7 @@ msgid ""
 "\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
 msgstr ""
 
-#: include/class_plugin.inc:1316
+#: include/class_plugin.inc:1319
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3525,39 +3524,39 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:260
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:261
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:262
+#: include/simpleplugin/class_helpersAttribute.inc:266
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_helpersAttribute.inc:267
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:275
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:276
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:277
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
@@ -3740,127 +3739,132 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:172
+#: html/index.php:171
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:174
+#: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:209
+#: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
 msgstr "La vostra sessiÃ³ del FusionDirectori ha caducat!"
 
-#: html/index.php:212
+#: html/index.php:211
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:214
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:218
+#: html/index.php:217
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:279
+#: html/index.php:278
 msgid "Please specify a valid username!"
 msgstr "Especifiqueu un nom d'usuari vÃ lid."
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify your password!"
 msgstr "Especifiqueu la vostra contrasenya."
 
-#: html/index.php:301
+#: html/index.php:300
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:331
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr "El compte Ã©s blocat. Contacteu el vostre administrador de sistemes."
 
-#: html/index.php:473
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:483
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:520
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr "El vostre navegador tÃ© les galetes inhabilitades. Habiliteu les galetes i torneu a carregar aquesta pÃ gina abans d'entrar."
 
-#: html/main.php:113
+#: html/main.php:115
 msgid "PHP configuration"
 msgstr "ConfiguraciÃ³ del PHP"
 
-#: html/main.php:114
+#: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Password change"
 msgstr "Canvi de contrasenya"
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:205
+#: html/main.php:158
+msgid "Your password has expired, please set a new one."
+msgstr ""
+
+#: html/main.php:208
 msgid "Running out of memory!"
 msgstr "S'estÃ  exhaurint la memÃ²ria!"
 
-#: html/main.php:248
+#: html/main.php:251
 msgid "User ACL checks disabled"
 msgstr "S'han inhabilitat les comprovacions de les ACL dels usuaris"
 
-#: html/main.php:286
+#: html/main.php:289
 msgid "Plugin"
 msgstr "Connector"
 
-#: html/main.php:287
+#: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
 msgstr ""
 
-#: html/main.php:302
+#: html/main.php:305
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:303
+#: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
@@ -3877,52 +3881,44 @@ msgstr "La configuraciÃ³ %s/%s del FusionDirectori no Ã©s llegible. S'estÃ  avor
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr "No es xifrarÃ  la sessiÃ³."
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr "Entreu a la sessiÃ³ amb SSL"
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:68
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4523,15 +4519,15 @@ msgid ""
 "'Off'."
 msgstr ""
 
-#: setup/class_setup.inc:127
+#: setup/class_setup.inc:122
 msgid "Setup error"
 msgstr ""
 
-#: setup/class_setup.inc:207
+#: setup/class_setup.inc:202
 msgid "Completed"
 msgstr ""
 
-#: setup/class_setup.inc:250
+#: setup/class_setup.inc:245
 msgid "Next"
 msgstr ""
 
@@ -4780,72 +4776,78 @@ msgstr ""
 msgid "Set"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
+#: ihtml/themes/default/recovery.tpl.c:8
+msgid "Lost password"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:11
-msgid "Lost password"
+msgid ""
+"Informations to reset password for %1 have been sent to email address %2"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:14
+msgid "Warning : this email is only valid for %1 minutes."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:17
 #: ihtml/themes/default/recovery.tpl.c:20
-#: ihtml/themes/default/recovery.tpl.c:62
-#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr "Directori"
 
-#: ihtml/themes/default/recovery.tpl.c:32
 #: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "Contrasenya nova repetida"
 
-#: ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr "Qualitat de la contrasenya"
 
-#: ihtml/themes/default/recovery.tpl.c:41
-#: ihtml/themes/default/recovery.tpl.c:74
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr "Canvia"
 
-#: ihtml/themes/default/recovery.tpl.c:44
-#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr "Feu clic aquÃ per canviar la vostra contrasenya"
 
-#: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/recovery.tpl.c:53
 msgid "Success"
 msgstr "Ãˆxit"
 
-#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr "S'ha canviat la vostra contrasenya amb Ã¨xit."
 
-#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
+"=> Use your e-mail in the long format, e.g : John Doe => "
+"john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:71
-msgid "Mail"
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
diff --git a/locale/cs_CZ/fusiondirectory.po b/locale/cs_CZ/fusiondirectory.po
index 62c5dc2e28f70ad7b5e79ce40b17698273c3a027..7e9dd830a7d625fad5c61e0919fcc127ef775b1a 100644
--- a/locale/cs_CZ/fusiondirectory.po
+++ b/locale/cs_CZ/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-10 13:25+0200\n"
-"PO-Revision-Date: 2016-06-03 11:03+0000\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
+"PO-Revision-Date: 2016-06-25 10:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -144,7 +144,7 @@ msgstr "Vynutit konkrÃ©tnÃ identifikÃ¡tor pro tuto skupinu"
 
 #: plugins/admin/groups/class_group.inc:73
 #: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:414
 msgid "GID"
 msgstr "GID"
 
@@ -201,11 +201,10 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr "TÃ©to skupinÄ› umoÅ¾nit pÅ™ipojenÃ pouze na poÄÃtaÄe z tohoto seznamu"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467 include/functions.inc:799
+#: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:520 html/class_passwordRecovery.inc:169
-#: setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -217,7 +216,7 @@ msgid "Warning"
 msgstr "VarovÃ¡nÃ"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr "VyprÅ¡el ÄasovÃ½ limit pÅ™i ÄekÃ¡nÃ na zÃ¡mek â€“ zÃ¡mek bude proto nebude brÃ¡n v potaz!"
 
@@ -562,7 +561,7 @@ msgstr "JmÃ©no"
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr "PÅ™ihlaÅ¡ovacÃ jmÃ©no"
 
@@ -933,7 +932,7 @@ msgstr "Metoda otisku hesla"
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1151,8 +1150,8 @@ msgid ""
 msgstr "ZadÃ¡nÃ v kolonkÃ¡ch NovÃ© heslo a ZopakovÃ¡nÃ novÃ©ho hesla se neshodujÃ."
 
 #: plugins/personal/generic/class_user.inc:654
-#: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:32
 msgid "New password"
 msgstr "NovÃ© heslo"
 
@@ -1337,11 +1336,11 @@ msgstr "platnost hesla skonÄila"
 msgid "password not changeable"
 msgstr "heslo nelze zmÄ›nit"
 
-#: plugins/personal/posix/class_posixAccount.inc:408
+#: plugins/personal/posix/class_posixAccount.inc:411
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:530
 #, php-format
 msgid "Group of user %s"
 msgstr "Skupina uÅ¾ivatele %s"
@@ -1583,8 +1582,8 @@ msgid "Session lifetime"
 msgstr "Doba neÄinnosti, po jejÃmÅ¾ uplynutÃ bude relace automaticky ukonÄena."
 
 #: plugins/config/class_configInLdap.inc:207
-msgid "Defines when a session will expire in seconds."
-msgstr "UrÄuje, za jak dlouho (v sekundÃ¡ch) skonÄÃ platnost relace."
+msgid "Defines when a session will expire in seconds (0 to disable)."
+msgstr ""
 
 #: plugins/config/class_configInLdap.inc:212
 msgid "HTTP authentication"
@@ -2164,7 +2163,7 @@ msgstr "Vybrat vÅ¡e"
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:790
-#: include/class_plugin.inc:1518 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1521 include/class_CopyPasteHandler.inc:276
 #: include/simpleplugin/class_attribute.inc:1571
 #: include/simpleplugin/class_attribute.inc:1574
 #: include/simpleplugin/class_attribute.inc:1577
@@ -2177,7 +2176,7 @@ msgstr "Vybrat vÅ¡e"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:471 html/index.php:481
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2301,7 +2300,7 @@ msgstr "Chyba XML ve fusiondirectory.conf: %s na Å™Ã¡dku %d"
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr "Chyba v nastavenÃ"
 
@@ -2323,7 +2322,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:367 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3415,7 +3414,7 @@ msgid ""
 "\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
 msgstr ""
 
-#: include/class_plugin.inc:1316
+#: include/class_plugin.inc:1319
 #, php-format
 msgid "Tab \"%s\""
 msgstr "Panel %s"
@@ -3525,39 +3524,39 @@ msgstr "Å¾Ã¡dnÃ©"
 msgid "Unknown"
 msgstr "neznÃ¡mÃ©"
 
-#: include/simpleplugin/class_helpersAttribute.inc:260
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:261
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "KiB"
 msgstr "KiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:262
+#: include/simpleplugin/class_helpersAttribute.inc:266
 msgid "MiB"
 msgstr "MiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_helpersAttribute.inc:267
 msgid "GiB"
 msgstr "GiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "TiB"
 msgstr "TiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:275
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr "sekundy"
 
-#: include/simpleplugin/class_helpersAttribute.inc:276
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr "minuty"
 
-#: include/simpleplugin/class_helpersAttribute.inc:277
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr "hodiny"
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr "dny"
 
@@ -3740,127 +3739,132 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr "Jako objectType (typ objektu) buÄ nebylo zadÃ¡no nic, nebo nesprÃ¡vnÃ¡ hodnota."
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
-msgstr "Tato relace nenÃ Å¡ifrovÃ¡na!"
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
+msgstr ""
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
-msgstr "NastavenÃ doby platnosti sezenÃ bude brÃ¡no z php.ini namÃsto z fusiondirectory.conf."
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
+msgstr ""
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr "NastavenÃ FusionDirectory %s/%s nenÃ ÄitelnÃ©. Pro nÃ¡pravu spusÅ¥te (na serveru) pÅ™Ãkaz fusiondirectory-setup --check-config ."
 
-#: html/index.php:172
+#: html/index.php:171
 msgid "Smarty error"
 msgstr "Chyba ve Smarty"
 
-#: html/index.php:174
+#: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr "SloÅ¾ka %s, zadanÃ¡ jako kompilaÄnÃ, nenÃ pÅ™ÃstupnÃ¡!"
 
-#: html/index.php:209
+#: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
 msgstr "Platnost vaÅ¡eho sezenÃ ve FusionDirectory skonÄila!"
 
-#: html/index.php:212
+#: html/index.php:211
 msgid "Your IP has changed!"
 msgstr "VaÅ¡e IP adresa byla zmÄ›nÄ›na!"
 
-#: html/index.php:215
+#: html/index.php:214
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr "NeplatnÃ½ parametr %s pro zÃ¡suvnÃ½ modul!"
 
-#: html/index.php:218
+#: html/index.php:217
 msgid "No session found!"
 msgstr "Nebyla nalezena Å¾Ã¡dnÃ¡ relace!"
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr "Chyby nahlÃ¡Å¡enÃ© pÅ™i kontrole LDAP schÃ©matu:"
 
-#: html/index.php:279
+#: html/index.php:278
 msgid "Please specify a valid username!"
 msgstr "Zadejte platnÃ© uÅ¾ivatelskÃ© jmÃ©no!"
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify your password!"
 msgstr "Zadejte svÃ© heslo!"
 
-#: html/index.php:301
+#: html/index.php:300
 msgid "Please check the username/password combination."
 msgstr "Zkontrolujte prosÃm sprÃ¡vnost kombinace zadanÃ©ho uÅ¾ivatelskÃ©ho jmÃ©na a hesla."
 
-#: html/index.php:331
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr "ÃšÄet je uzamÄen. Kontaktujte svÃ©ho sprÃ¡vce systÃ©mÅ¯!"
 
-#: html/index.php:473
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:483
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:520
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr "VÃ¡Å¡ webovÃ½ prohlÃÅ¾eÄ mÃ¡ zakÃ¡zanÃ© cookies. ProsÃm povolte je a pÅ™ed dalÅ¡Ãm pokusem o pÅ™ihlÃ¡Å¡enÃ strÃ¡nku nechejte tuto strÃ¡nku naÄÃst znovu!"
 
-#: html/main.php:113
+#: html/main.php:115
 msgid "PHP configuration"
 msgstr "NastavenÃ PHP"
 
-#: html/main.php:114
+#: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr "FatÃ¡lnÃ chyba: v PHP je zapnuto 'register globals'. Dokud to VÃ¡Å¡ sprÃ¡vce systÃ©mÅ¯ neopravÃ, nebude moÅ¾nÃ© se pÅ™ihlÃ¡sit do FusionDirectory."
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Password change"
 msgstr "ZmÄ›na hesla"
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
 msgstr "Platnost vaÅ¡eho hesla jiÅ¾ brzy skonÄÃ â€“ zmÄ›Åˆte ho prosÃm!"
 
-#: html/main.php:205
+#: html/main.php:158
+msgid "Your password has expired, please set a new one."
+msgstr ""
+
+#: html/main.php:208
 msgid "Running out of memory!"
 msgstr "DochÃ¡zÃ volnÃ¡ kapacita operaÄnÃ pamÄ›ti!"
 
-#: html/main.php:248
+#: html/main.php:251
 msgid "User ACL checks disabled"
 msgstr "kontrola dle ACL je vypnuta"
 
-#: html/main.php:286
+#: html/main.php:289
 msgid "Plugin"
 msgstr "ZÃ¡suvnÃ½ modul"
 
-#: html/main.php:287
+#: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
 msgstr "FatÃ¡lnÃ chyba: Nelze nalÃ©zt jakÃ©koli definice zÃ¡suvnÃ©ho modulu pro modul %s (%s nenÃ soubor)!"
 
-#: html/main.php:302
+#: html/main.php:305
 msgid "Configuration Error"
 msgstr "Chyba v nastavenÃ"
 
-#: html/main.php:303
+#: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
@@ -3877,52 +3881,44 @@ msgstr "NastavenÃ %s/%s FusionDirectory nenÃ ÄitelnÃ©. Akce byla zruÅ¡ena."
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "SloÅ¾ka %s, nastavenÃ¡ jako mÃsto pro provedenÃ sestavenÃ, nenÃ pÅ™ÃstupnÃ¡!"
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr "SezenÃ nebude Å¡ifrovÃ¡no."
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr "otevÅ™Ãt relaci Å¡ifrovanou pomocÃ protokolu SSL"
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr "ÃšÄet s uÅ¾ivatelskÃ½m jmÃ©nem %s nebyl nalezen"
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr "Bylo nalezeno hned nÄ›kolik ÃºÄtÅ¯ s uÅ¾ivatelskÃ½m jmÃ©nem %s"
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:68
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr "E-mailovÃ¡ adresa"
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr "Nastal problÃ©m s poÅ¡tovnÃm serverem â€“ obraÅ¥te se na svÃ©ho sprÃ¡vce systÃ©mÅ¯."
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr "tato poukÃ¡zka (token) je neplatnÃ¡"
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr "Vyskytl se problÃ©m s poÅ¡tovnÃm serverem, potvrzovacÃ e-mail proto nebyl odeslÃ¡n"
 
@@ -4523,15 +4519,15 @@ msgid ""
 "'Off'."
 msgstr "Vyhledejte ve svÃ©m souboru php.ini parametr zend.ze1_compatibility_mode a nastavte jej na hodnotu off ."
 
-#: setup/class_setup.inc:127
+#: setup/class_setup.inc:122
 msgid "Setup error"
 msgstr "Chyba instalÃ¡toru"
 
-#: setup/class_setup.inc:207
+#: setup/class_setup.inc:202
 msgid "Completed"
 msgstr "Hotovo"
 
-#: setup/class_setup.inc:250
+#: setup/class_setup.inc:245
 msgid "Next"
 msgstr "DalÅ¡Ã"
 
@@ -4787,72 +4783,78 @@ msgstr "Ignorovat tuto chybu a zobrazit vÅ¡echny poloÅ¾ky, kterÃ© nejsou vÄ›tÅ¡
 msgid "Set"
 msgstr "Nastavit"
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
-msgstr "Obnova ztracenÃ©ho hesla od FusionDirectory"
-
-#: ihtml/themes/default/recovery.tpl.c:11
+#: ihtml/themes/default/recovery.tpl.c:8
 msgid "Lost password"
 msgstr "ZtracenÃ© heslo"
 
+#: ihtml/themes/default/recovery.tpl.c:11
+msgid ""
+"Informations to reset password for %1 have been sent to email address %2"
+msgstr ""
+
 #: ihtml/themes/default/recovery.tpl.c:14
+msgid "Warning : this email is only valid for %1 minutes."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr "Tento dialog umoÅ¾Åˆuje jednoduÅ¡e si zmÄ›nit heslo. Zadejte (dvakrÃ¡t) novÃ© heslo do polÃÄek nÃÅ¾e a kliknÄ›te na 'zmÄ›nit'."
 
-#: ihtml/themes/default/recovery.tpl.c:17
 #: ihtml/themes/default/recovery.tpl.c:20
-#: ihtml/themes/default/recovery.tpl.c:62
-#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr "adresÃ¡Å™"
 
-#: ihtml/themes/default/recovery.tpl.c:32
 #: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "ZopakovÃ¡nÃ novÃ©ho hesla"
 
-#: ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr "Odolnost hesla"
 
-#: ihtml/themes/default/recovery.tpl.c:41
-#: ihtml/themes/default/recovery.tpl.c:74
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr "ZmÄ›nit"
 
-#: ihtml/themes/default/recovery.tpl.c:44
-#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr "Pro zmÄ›nu hesla kliknÄ›te sem"
 
-#: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/recovery.tpl.c:53
 msgid "Success"
 msgstr "ÃšspÄ›ch"
 
-#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr "VaÅ¡e heslo bylo ÃºspÄ›Å¡nÄ› zmÄ›nÄ›no."
 
-#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr "Do polÃÄka nÃÅ¾e zadejte svou e-mailovou adresu a kliknÄ›te na  ZmÄ›nit."
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
-msgstr "=> PouÅ¾ijte svou e-mailovou adresu v dlouhÃ©m formÃ¡tu, napÅ™Ãklad : Jan NovÃ¡k => jan.novak@vase_domena.cz"
+"=> Use your e-mail in the long format, e.g : John Doe => "
+"john.doe@example.com"
+msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:71
-msgid "Mail"
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
 msgstr "E-mail"
 
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
diff --git a/locale/de/fusiondirectory.po b/locale/de/fusiondirectory.po
index 2e207116f9e540fe5025242b3a22e2a1ee6308cb..d3cc8215aefcd64027bf6ec5e50947ea2a6d8d8b 100644
--- a/locale/de/fusiondirectory.po
+++ b/locale/de/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-10 13:25+0200\n"
-"PO-Revision-Date: 2016-06-03 11:03+0000\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
+"PO-Revision-Date: 2016-06-25 10:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: German (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -144,7 +144,7 @@ msgstr "GID-Wert fÃ¼r diese Gruppe erzwingen"
 
 #: plugins/admin/groups/class_group.inc:73
 #: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:414
 msgid "GID"
 msgstr "GID"
 
@@ -201,11 +201,10 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr "Nur dieser Gruppe erlauben, dieser Liste von Hosts zu verbinden"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467 include/functions.inc:799
+#: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:520 html/class_passwordRecovery.inc:169
-#: setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -217,7 +216,7 @@ msgid "Warning"
 msgstr "Warnung"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr "Wartezeit fÃ¼r Sperre abgelaufen. Ignoriere Sperre!"
 
@@ -562,7 +561,7 @@ msgstr "Vorname"
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr "Kennung"
 
@@ -933,7 +932,7 @@ msgstr "Zu verwendende Passworthash-Methode"
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1151,8 +1150,8 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:654
-#: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:32
 msgid "New password"
 msgstr "Neues Passwort"
 
@@ -1337,11 +1336,11 @@ msgstr "Passwort abgelaufen"
 msgid "password not changeable"
 msgstr "Passwort kann nicht geÃ¤ndert werden"
 
-#: plugins/personal/posix/class_posixAccount.inc:408
+#: plugins/personal/posix/class_posixAccount.inc:411
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:530
 #, php-format
 msgid "Group of user %s"
 msgstr "Gruppe des Benutzers %s"
@@ -1583,8 +1582,8 @@ msgid "Session lifetime"
 msgstr "Lebensdauer der Sitzung"
 
 #: plugins/config/class_configInLdap.inc:207
-msgid "Defines when a session will expire in seconds."
-msgstr "Bestimmt in Sekunden wann eine Sitzung ablÃ¤uft."
+msgid "Defines when a session will expire in seconds (0 to disable)."
+msgstr ""
 
 #: plugins/config/class_configInLdap.inc:212
 msgid "HTTP authentication"
@@ -2164,7 +2163,7 @@ msgstr "Alle auswÃ¤hlen"
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:790
-#: include/class_plugin.inc:1518 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1521 include/class_CopyPasteHandler.inc:276
 #: include/simpleplugin/class_attribute.inc:1571
 #: include/simpleplugin/class_attribute.inc:1574
 #: include/simpleplugin/class_attribute.inc:1577
@@ -2177,7 +2176,7 @@ msgstr "Alle auswÃ¤hlen"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:471 html/index.php:481
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2301,7 +2300,7 @@ msgstr "XML-Fehler in der Datei fusiondirectory.conf: %s in Zeile %d"
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr "Konfigurationsfehler"
 
@@ -2323,7 +2322,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:367 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3415,7 +3414,7 @@ msgid ""
 "\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
 msgstr ""
 
-#: include/class_plugin.inc:1316
+#: include/class_plugin.inc:1319
 #, php-format
 msgid "Tab \"%s\""
 msgstr "Tab \"%s\""
@@ -3525,39 +3524,39 @@ msgstr "Keine"
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: include/simpleplugin/class_helpersAttribute.inc:260
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:261
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "KiB"
 msgstr "KiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:262
+#: include/simpleplugin/class_helpersAttribute.inc:266
 msgid "MiB"
 msgstr "MiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_helpersAttribute.inc:267
 msgid "GiB"
 msgstr "GiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "TiB"
 msgstr "TiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:275
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr "Sekunden"
 
-#: include/simpleplugin/class_helpersAttribute.inc:276
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr "Minuten"
 
-#: include/simpleplugin/class_helpersAttribute.inc:277
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr "Stunden"
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr "Tage"
 
@@ -3740,127 +3739,132 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr "Der angegebene Objekt-Typ ist leer oder ungÃ¼ltig!"
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
-msgstr "Die Sitzung ist nicht verschlÃ¼sselt!"
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
+msgstr ""
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
-msgstr "Die Konfiguration der GÃ¼ltigkeitsdauer einer Sitzung in Ihrer fusiondirectory.conf wird von der Einstellung in der php.ini Ã¼berschrieben."
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
+msgstr ""
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr "FusionDirectory Konfiguration %s/%s ist nicht lesbar. Bitte starten Sie fusiondirectory-setup --check-config um dies zu beheben."
 
-#: html/index.php:172
+#: html/index.php:171
 msgid "Smarty error"
 msgstr "Smarty-Fehler"
 
-#: html/index.php:174
+#: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:209
+#: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
 msgstr "Ihre FusionDirectory Sitzung ist abgelaufen!"
 
-#: html/index.php:212
+#: html/index.php:211
 msgid "Your IP has changed!"
 msgstr "Ihre IP hat sich geÃ¤ndert!"
 
-#: html/index.php:215
+#: html/index.php:214
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:218
+#: html/index.php:217
 msgid "No session found!"
 msgstr "Keine Sitzung gefunden!"
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:279
+#: html/index.php:278
 msgid "Please specify a valid username!"
 msgstr "Bitte geben Sie einen gÃ¼ltigen Benutzernamen ein!"
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify your password!"
 msgstr "Bitte geben Sie Ihr Passwort ein!"
 
-#: html/index.php:301
+#: html/index.php:300
 msgid "Please check the username/password combination."
 msgstr "Bitte Ã¼berprÃ¼fen Sie die Kombination von Benutzernamen und Passwort."
 
-#: html/index.php:331
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Das Konto ist gesperrt. Bitte benachrichtigen Sie den Administrator!"
 
-#: html/index.php:473
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:483
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:520
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr "Ihr Browser hat Cookies deaktiviert. Bitte aktivieren Sie zunÃ¤chst Cookies und laden anschliessend diese Seite neu, bevor Sie sich anmelden!"
 
-#: html/main.php:113
+#: html/main.php:115
 msgid "PHP configuration"
 msgstr "PHP-Konfiguration"
 
-#: html/main.php:114
+#: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr "Schwerer Fehler: Register globals ist aktiviert. FusionDirectory wird Logins verweigern sollte dies nicht von einem Administrator behoben werden."
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Password change"
 msgstr "PasswortÃ¤nderung"
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
 msgstr "Ihr Passwort ist fast abgelaufen, bitte setzen Sie ein neues!"
 
-#: html/main.php:205
+#: html/main.php:158
+msgid "Your password has expired, please set a new one."
+msgstr ""
+
+#: html/main.php:208
 msgid "Running out of memory!"
 msgstr "Der verfÃ¼gbare Arbeitsspeicher wird knapp!"
 
-#: html/main.php:248
+#: html/main.php:251
 msgid "User ACL checks disabled"
 msgstr "PrÃ¼fung der Benutzer-ACLs deaktiviert"
 
-#: html/main.php:286
+#: html/main.php:289
 msgid "Plugin"
 msgstr "Erweiterung"
 
-#: html/main.php:287
+#: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
 msgstr "Schwerer Fehler: Kann keine Plugin-Definitionen fÃ¼r Plugin '%s' finden ('%s' ist keine Datei)!"
 
-#: html/main.php:302
+#: html/main.php:305
 msgid "Configuration Error"
 msgstr "Konfigurationsfehler"
 
-#: html/main.php:303
+#: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
@@ -3877,52 +3881,44 @@ msgstr "FusionDirectory Konfiguration %s/%s ist nicht lesbar. Abgebrochen."
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "Auf das als Kompilierverzeichnis angegegebene Verzeichnis '%s' kann nicht zugegriffen werden!"
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr "Die Sitzung ist nicht verschlÃ¼sselt."
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr "SSL Sitzung"
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:68
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr "Email-Adresse"
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr "Kontaktieren Sie Ihren Administrator, es gab ein Problem mit dem Mailserver"
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr "Das Token ist nicht gÃ¼ltig"
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr "Es gab ein Problem mit dem Mailserver, BestÃ¤tigungsmail wurde nicht verschickt"
 
@@ -4523,15 +4519,15 @@ msgid ""
 "'Off'."
 msgstr "Suchen Sie in Ihrer php.ini nach 'zend.ze1_compatibility_mode' und setzen Sie es auf 'Off'."
 
-#: setup/class_setup.inc:127
+#: setup/class_setup.inc:122
 msgid "Setup error"
 msgstr "Einrichtungsfehler"
 
-#: setup/class_setup.inc:207
+#: setup/class_setup.inc:202
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: setup/class_setup.inc:250
+#: setup/class_setup.inc:245
 msgid "Next"
 msgstr "Vor"
 
@@ -4780,72 +4776,78 @@ msgstr "Ignoriere diesen Fehler und zeige alle EintrÃ¤ge, die innerhalb der GrÃ¶
 msgid "Set"
 msgstr "Setzen"
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
-msgstr "FusionDirectory-Passwortwiederherstellung"
-
-#: ihtml/themes/default/recovery.tpl.c:11
+#: ihtml/themes/default/recovery.tpl.c:8
 msgid "Lost password"
 msgstr "Passwort vergessen"
 
+#: ihtml/themes/default/recovery.tpl.c:11
+msgid ""
+"Informations to reset password for %1 have been sent to email address %2"
+msgstr ""
+
 #: ihtml/themes/default/recovery.tpl.c:14
+msgid "Warning : this email is only valid for %1 minutes."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr "Dieser Dialog bietet eine einfache MÃ¶glichkeit, Ihr Passwort zu Ã¤ndern. Geben Sie das neue Passwort (zweimal) in die unten stehenden Felder ein und klicken Sie auf die SchaltflÃ¤che 'Ã„ndern'."
 
-#: ihtml/themes/default/recovery.tpl.c:17
 #: ihtml/themes/default/recovery.tpl.c:20
-#: ihtml/themes/default/recovery.tpl.c:62
-#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr "Verzeichnis"
 
-#: ihtml/themes/default/recovery.tpl.c:32
 #: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "Neues Passwort (Wiederholung)"
 
-#: ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr "PasswortstÃ¤rke"
 
-#: ihtml/themes/default/recovery.tpl.c:41
-#: ihtml/themes/default/recovery.tpl.c:74
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr "Ã„ndern"
 
-#: ihtml/themes/default/recovery.tpl.c:44
-#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr "Hier klicken, um Ihr Passwort zu Ã¤ndern"
 
-#: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/recovery.tpl.c:53
 msgid "Success"
 msgstr "Erfolg"
 
-#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr "Ihr Passwort wurde erfolgreich geÃ¤ndert."
 
-#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr "Geben Sie Ihre aktuelle Email-Adresse ins unten genannte Feld ein und klicken Sie die 'Ã„ndern'-SchaltflÃ¤che."
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
-msgstr "=> Benutzen Sie Ihre Email im Langformat, z.B. : John Doe => john.doe@ibcp.fr"
+"=> Use your e-mail in the long format, e.g : John Doe => "
+"john.doe@example.com"
+msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:71
-msgid "Mail"
-msgstr "Mail"
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
+msgstr "Email"
 
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
diff --git a/locale/el_GR/fusiondirectory.po b/locale/el_GR/fusiondirectory.po
index a62f3f553e4ce5f9397f7f3dd5e6864922264830..c53e55f2a9a37dfc5f7a5558cb009309b47d2e90 100644
--- a/locale/el_GR/fusiondirectory.po
+++ b/locale/el_GR/fusiondirectory.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-10 13:25+0200\n"
-"PO-Revision-Date: 2016-06-03 11:03+0000\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
+"PO-Revision-Date: 2016-06-25 10:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Greek (Greece) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/el_GR/)\n"
 "MIME-Version: 1.0\n"
@@ -150,7 +150,7 @@ msgstr "Î•Î¾Î±Î½Î±Î³ÎºÎ±ÏƒÎ¼ÏŒÏ‚ Ï„Î¹Î¼Î®Ï‚ GID Î³Î¹Î± Î±Ï…Ï„Î® Ï„Î·Î½ Î¿Î¼Î¬Î´
 
 #: plugins/admin/groups/class_group.inc:73
 #: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:414
 msgid "GID"
 msgstr "GID"
 
@@ -207,11 +207,10 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr "Î•Ï€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ Ïƒ'Î±Ï…Ï„Î® Ï„Î·Î½ Î¿Î¼Î¬Î´Î± Î½Î± ÏƒÏ…Î½Î´ÎÎµÏ„Î±Î¹ ÏƒÏ„Î·Î½ Î±ÎºÏŒÎ»Î¿Ï…Î¸Î· Î»Î¯ÏƒÏ„Î± Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„ÏŽÎ½"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467 include/functions.inc:799
+#: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:520 html/class_passwordRecovery.inc:169
-#: setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -223,7 +222,7 @@ msgid "Warning"
 msgstr "Î ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ·"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr "Î¥Ï€ÎÏÎ²Î±ÏƒÎ· Ï‡ÏÏŒÎ½Î¿Ï… ÎºÎ±Ï„Î¬ Ï„Î·Î½ Î±Î½Î±Î¼Î¿Î½Î® Î³Î¹Î± ÎºÎ»ÎÎ¹Î´Ï‰Î¼Î±. Î‘Î³Î½ÏŒÎ·ÏƒÎ· ÎºÎ»ÎµÎ¹Î´ÏŽÎ¼Î±Ï„Î¿Ï‚!"
 
@@ -568,7 +567,7 @@ msgstr "Î’Î±Ï€Ï„Î¹ÏƒÏ„Î¹ÎºÏŒ"
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr "Î£ÏÎ½Î´ÎµÏƒÎ·"
 
@@ -939,7 +938,7 @@ msgstr "ÎœÎÎ¸Î¿Î´Î¿Ï‚ hash Î³Î¹Î± Ï‡ÏÎ®ÏƒÎ· ÎºÏ‰Î´Î¹ÎºÎ¿Ï"
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1157,8 +1156,8 @@ msgid ""
 msgstr "ÎŸÎ¹ ÎºÏ‰Î´Î¹ÎºÎ¿Î¯ ÎµÎ¹ÏƒÎ¬Î³Î±Ï„Îµ Ï‰Ï‚ \"ÎÎÎ¿ ÎºÏ‰Î´Î¹ÎºÏŒ\" ÎºÎ±Î¹ \"Î•Ï€Î±Î½Î¬Î»Î·ÏˆÎ· Î½ÎÎ¿Ï… ÎºÏ‰Î´Î¹ÎºÎ¿Ï\" Î´ÎµÎ½ Ï„Î±Î¹ÏÎ¹Î¬Î¶Î¿Ï…Î½."
 
 #: plugins/personal/generic/class_user.inc:654
-#: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:32
 msgid "New password"
 msgstr "ÎÎÎ¿Ï‚ ÎºÏ‰Î´Î¹ÎºÏŒÏ‚ "
 
@@ -1343,11 +1342,11 @@ msgstr "Î¿ ÎºÏ‰Î´Î¹ÎºÏŒÏ‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚ ÎÏ‡ÎµÎ¹ Î»Î®Î¾ÎµÎ¹"
 msgid "password not changeable"
 msgstr "Î¿ ÎºÏ‰Î´Î¹ÎºÏŒÏ‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚ Î´ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Î±Î»Î»Î¬Î¾ÎµÎ¹"
 
-#: plugins/personal/posix/class_posixAccount.inc:408
+#: plugins/personal/posix/class_posixAccount.inc:411
 msgid "UID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:530
 #, php-format
 msgid "Group of user %s"
 msgstr "ÎŸÎ¼Î¬Î´Î± Ï„Î¿Ï… Ï‡ÏÎ®ÏƒÏ„Î· %s"
@@ -1589,8 +1588,8 @@ msgid "Session lifetime"
 msgstr "Î”Î¹Î¬ÏÎºÎµÎ¹Î± ÏƒÏ…Î½ÎµÎ´ÏÎ¯Î±Ï‚"
 
 #: plugins/config/class_configInLdap.inc:207
-msgid "Defines when a session will expire in seconds."
-msgstr "ÎšÎ±Î¸Î¿ÏÎ¯Î¶ÎµÎ¹ Ï€ÏŒÏ„Îµ Î¼Î¹Î± ÏƒÏ…Î½ÎµÎ´ÏÎ¯Î± Î¸Î± Î»Î®Î¾ÎµÎ¹ Î¼ÎÏƒÎ± ÏƒÎµ Î´ÎµÏ…Ï„ÎµÏÏŒÎ»ÎµÏ€Ï„Î±"
+msgid "Defines when a session will expire in seconds (0 to disable)."
+msgstr ""
 
 #: plugins/config/class_configInLdap.inc:212
 msgid "HTTP authentication"
@@ -2170,7 +2169,7 @@ msgstr "Î•Ï€Î¹Î»Î¿Î³Î® ÏŒÎ»Ï‰Î½"
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:790
-#: include/class_plugin.inc:1518 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1521 include/class_CopyPasteHandler.inc:276
 #: include/simpleplugin/class_attribute.inc:1571
 #: include/simpleplugin/class_attribute.inc:1574
 #: include/simpleplugin/class_attribute.inc:1577
@@ -2183,7 +2182,7 @@ msgstr "Î•Ï€Î¹Î»Î¿Î³Î® ÏŒÎ»Ï‰Î½"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:471 html/index.php:481
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2307,7 +2306,7 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr "Î£Ï†Î¬Î»Î¼Î± ÏÏÎ¸Î¼Î¹ÏƒÎ·Ï‚"
 
@@ -2329,7 +2328,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:367 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3421,7 +3420,7 @@ msgid ""
 "\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
 msgstr ""
 
-#: include/class_plugin.inc:1316
+#: include/class_plugin.inc:1319
 #, php-format
 msgid "Tab \"%s\""
 msgstr "Tab \"%s\""
@@ -3531,39 +3530,39 @@ msgstr "ÎšÎ±Î½ÎÎ½Î±"
 msgid "Unknown"
 msgstr "Î†Î³Î½Ï‰ÏƒÏ„Î¿"
 
-#: include/simpleplugin/class_helpersAttribute.inc:260
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:261
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "KiB"
 msgstr "KiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:262
+#: include/simpleplugin/class_helpersAttribute.inc:266
 msgid "MiB"
 msgstr "MiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_helpersAttribute.inc:267
 msgid "GiB"
 msgstr "GiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "TiB"
 msgstr "TiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:275
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr "Î´ÎµÏ…Ï„ÎµÏÏŒÎ»ÎµÏ€Ï„Î±"
 
-#: include/simpleplugin/class_helpersAttribute.inc:276
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr "Î»ÎµÏ€Ï„Î¬"
 
-#: include/simpleplugin/class_helpersAttribute.inc:277
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr "ÏŽÏÎµÏ‚"
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr "Î·Î¼ÎÏÎµÏ‚"
 
@@ -3746,127 +3745,132 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:172
+#: html/index.php:171
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:174
+#: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:209
+#: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:212
+#: html/index.php:211
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:214
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:218
+#: html/index.php:217
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:279
+#: html/index.php:278
 msgid "Please specify a valid username!"
 msgstr "Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÎºÎ±Î¸Î¿ÏÎ¯ÏƒÏ„Îµ ÎÎ½Î± ÎÎ³ÎºÏ…ÏÎ¿ ÏŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î·!"
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:301
+#: html/index.php:300
 msgid "Please check the username/password combination."
 msgstr "Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÎµÎ»ÎÎ³Î¾Ï„Îµ Ï„Î¿ ÏƒÏ…Î½Î´Ï…Î±ÏƒÎ¼ÏŒ ÏŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î·/ÎºÏ‰Î´Î¹ÎºÏŒÏ‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚."
 
-#: html/index.php:331
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:473
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:483
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:520
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr ""
 
-#: html/main.php:113
+#: html/main.php:115
 msgid "PHP configuration"
 msgstr ""
 
-#: html/main.php:114
+#: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Password change"
 msgstr ""
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:205
+#: html/main.php:158
+msgid "Your password has expired, please set a new one."
+msgstr ""
+
+#: html/main.php:208
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:248
+#: html/main.php:251
 msgid "User ACL checks disabled"
 msgstr ""
 
-#: html/main.php:286
+#: html/main.php:289
 msgid "Plugin"
 msgstr "Î ÏÏŒÏƒÎ¸ÎµÏ„Î¿"
 
-#: html/main.php:287
+#: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
 msgstr ""
 
-#: html/main.php:302
+#: html/main.php:305
 msgid "Configuration Error"
 msgstr "Î£Ï†Î¬Î»Î¼Î± ÏÏÎ¸Î¼Î¹ÏƒÎ·Ï‚"
 
-#: html/main.php:303
+#: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
@@ -3883,52 +3887,44 @@ msgstr "ÎŸÎ¹ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ FusionDirectory %s/%s  Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î±Î½Î±
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr ""
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr ""
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:68
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr "Î”Î¹ÎµÏ…Î¸ÏÎ½ÏƒÎ· Î·Î»ÎµÎºÏ„ÏÎ¿Î½Î¹ÎºÎ®Ï‚ Î±Î»Î»Î·Î»Î¿Î³Î³ÏÎ±Ï†Î¯Î±Ï‚"
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4529,15 +4525,15 @@ msgid ""
 "'Off'."
 msgstr ""
 
-#: setup/class_setup.inc:127
+#: setup/class_setup.inc:122
 msgid "Setup error"
 msgstr ""
 
-#: setup/class_setup.inc:207
+#: setup/class_setup.inc:202
 msgid "Completed"
 msgstr ""
 
-#: setup/class_setup.inc:250
+#: setup/class_setup.inc:245
 msgid "Next"
 msgstr ""
 
@@ -4786,72 +4782,78 @@ msgstr ""
 msgid "Set"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
-msgstr ""
-
-#: ihtml/themes/default/recovery.tpl.c:11
+#: ihtml/themes/default/recovery.tpl.c:8
 msgid "Lost password"
 msgstr "Î§Î±Î¼ÎÎ½Î¿Ï‚ ÎºÏ‰Î´Î¹ÎºÏŒÏ‚"
 
+#: ihtml/themes/default/recovery.tpl.c:11
+msgid ""
+"Informations to reset password for %1 have been sent to email address %2"
+msgstr ""
+
 #: ihtml/themes/default/recovery.tpl.c:14
+msgid "Warning : this email is only valid for %1 minutes."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:17
 #: ihtml/themes/default/recovery.tpl.c:20
-#: ihtml/themes/default/recovery.tpl.c:62
-#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr "ÎšÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚"
 
-#: ihtml/themes/default/recovery.tpl.c:32
 #: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "Î•Ï€Î±Î½Î¬Î»Î·ÏˆÎ· Î½ÎÎ¿Ï… ÎºÏ‰Î´Î¹ÎºÎ¿Ï"
 
-#: ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr "Î™ÏƒÏ‡ÏÏ‚ ÎºÏ‰Î´Î¹ÎºÎ¿Ï"
 
-#: ihtml/themes/default/recovery.tpl.c:41
-#: ihtml/themes/default/recovery.tpl.c:74
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr "Î‘Î»Î»Î±Î³Î®"
 
-#: ihtml/themes/default/recovery.tpl.c:44
-#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr "ÎšÎ¬Î½Ï„Îµ ÎºÎ»Î¹Îº ÎµÎ´ÏŽ Î³Î¹Î± Î½Î± Î±Î»Î»Î¬Î¾ÎµÏ„Îµ Ï„Î¿Î½ ÎºÏ‰Î´Î¹ÎºÏŒ ÏƒÎ±Ï‚"
 
-#: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/recovery.tpl.c:53
 msgid "Success"
 msgstr "Î•Ï€Î¹Ï„Ï…Ï‡Î¯Î±"
 
-#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr "ÎŸ ÎºÏ‰Î´Î¹ÎºÏŒÏ‚ ÏƒÎ±Ï‚ Î¬Î»Î»Î±Î¾Îµ Î¼Îµ ÎµÏ€Î¹Ï„Ï…Ï‡Î¯Î±"
 
-#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
+"=> Use your e-mail in the long format, e.g : John Doe => "
+"john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:71
-msgid "Mail"
-msgstr "Î‘Î»Î»Î·Î»Î¿Î³ÏÎ±Ï†Î¯Î±"
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
+msgstr "Î—Î». Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ·"
 
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
diff --git a/locale/en/fusiondirectory.po b/locale/en/fusiondirectory.po
index c1b8eec7fbd1590059586a443a3c6b08f5a1bf08..640e1adccb96f1471482b07cc78a31d48e612073 100644
--- a/locale/en/fusiondirectory.po
+++ b/locale/en/fusiondirectory.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory VERSION\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-03 13:06+0200\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -145,7 +145,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_group.inc:73
 #: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:414
 msgid "GID"
 msgstr ""
 
@@ -202,11 +202,10 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467 include/functions.inc:799
+#: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:522 html/class_passwordRecovery.inc:169
-#: setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -218,7 +217,7 @@ msgid "Warning"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
@@ -259,7 +258,7 @@ msgstr ""
 
 #: plugins/admin/groups/group-list.xml:54
 #: plugins/admin/departments/dep-list.xml:37
-#: plugins/admin/users/user-list.xml:62 include/class_listing.inc:1283
+#: plugins/admin/users/user-list.xml:62 include/class_listing.inc:1284
 #: include/simpleplugin/simple-list.xml:48
 msgid "Actions"
 msgstr ""
@@ -563,7 +562,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr ""
 
@@ -630,7 +629,7 @@ msgstr ""
 #: plugins/admin/users/class_userManagement.inc:141
 #: include/class_management.inc:334 include/class_management.inc:483
 #: include/class_management.inc:503 include/class_management.inc:521
-#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:235
+#: include/class_management.inc:570 include/class_CopyPasteHandler.inc:246
 #: include/simpleplugin/class_simpleManagement.inc:654
 #: include/simpleplugin/class_simpleManagement.inc:754
 #: include/simpleplugin/class_simpleManagement.inc:805
@@ -934,7 +933,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1152,8 +1151,8 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:654
-#: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:32
 msgid "New password"
 msgstr ""
 
@@ -1338,11 +1337,11 @@ msgstr ""
 msgid "password not changeable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:408
+#: plugins/personal/posix/class_posixAccount.inc:411
 msgid "UID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:530
 #, php-format
 msgid "Group of user %s"
 msgstr ""
@@ -1584,7 +1583,7 @@ msgid "Session lifetime"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:207
-msgid "Defines when a session will expire in seconds."
+msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:212
@@ -2131,30 +2130,30 @@ msgstr ""
 msgid "Configuration for plugins"
 msgstr ""
 
-#: include/class_listing.inc:306 include/class_listing.inc:1154
-#: include/class_listing.inc:1156
+#: include/class_listing.inc:307 include/class_listing.inc:1155
+#: include/class_listing.inc:1157
 msgid "Up"
 msgstr ""
 
-#: include/class_listing.inc:306
+#: include/class_listing.inc:307
 msgid "Down"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2701
+#: include/class_listing.inc:307 include/simpleplugin/class_attribute.inc:2701
 #: include/simpleplugin/class_attribute.inc:2702
 msgid "Sort up"
 msgstr ""
 
-#: include/class_listing.inc:306 include/simpleplugin/class_attribute.inc:2714
+#: include/class_listing.inc:307 include/simpleplugin/class_attribute.inc:2714
 #: include/simpleplugin/class_attribute.inc:2715
 msgid "Sort down"
 msgstr ""
 
-#: include/class_listing.inc:367 setup/setup_migrate_gosaAccounts.tpl.c:23
+#: include/class_listing.inc:368 setup/setup_migrate_gosaAccounts.tpl.c:23
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:537 include/class_management.inc:679
+#: include/class_listing.inc:538 include/class_management.inc:679
 #: include/class_config.inc:357 include/class_msgPool.inc:215
 #: include/class_msgPool.inc:235 include/class_msgPool.inc:265
 #: include/class_msgPool.inc:682 include/class_msgPool.inc:713
@@ -2164,7 +2163,7 @@ msgstr ""
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:790
-#: include/class_plugin.inc:1513 include/class_CopyPasteHandler.inc:265
+#: include/class_plugin.inc:1521 include/class_CopyPasteHandler.inc:276
 #: include/simpleplugin/class_attribute.inc:1571
 #: include/simpleplugin/class_attribute.inc:1574
 #: include/simpleplugin/class_attribute.inc:1577
@@ -2177,83 +2176,83 @@ msgstr ""
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:473 html/index.php:483
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
 msgstr ""
 
-#: include/class_listing.inc:578
+#: include/class_listing.inc:579
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1146
+#: include/class_listing.inc:1147
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1146 include/class_listing.inc:1148
+#: include/class_listing.inc:1147 include/class_listing.inc:1149
 #: include/class_baseSelector.inc:210
 msgid "Root"
 msgstr ""
 
-#: include/class_listing.inc:1154
+#: include/class_listing.inc:1155
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1162
+#: include/class_listing.inc:1163
 msgid "Go to user's department"
 msgstr ""
 
-#: include/class_listing.inc:1162 include/class_listing.inc:1164
+#: include/class_listing.inc:1163 include/class_listing.inc:1165
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1169
+#: include/class_listing.inc:1170
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1169 include/class_baseSelector.inc:262
+#: include/class_listing.inc:1170 include/class_baseSelector.inc:262
 msgid "Submit"
 msgstr ""
 
-#: include/class_listing.inc:1589 include/class_listing.inc:1643
+#: include/class_listing.inc:1590 include/class_listing.inc:1644
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1595 include/class_listing.inc:1631
+#: include/class_listing.inc:1596 include/class_listing.inc:1632
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1603 include/class_listing.inc:1605
-#: include/class_CopyPasteHandler.inc:357
+#: include/class_listing.inc:1604 include/class_listing.inc:1606
+#: include/class_CopyPasteHandler.inc:368
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1631
+#: include/class_listing.inc:1632
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1643
+#: include/class_listing.inc:1644
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1676 include/class_listing.inc:1678
+#: include/class_listing.inc:1677 include/class_listing.inc:1679
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1692
+#: include/class_listing.inc:1693
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1727 include/class_listing.inc:1728
+#: include/class_listing.inc:1728 include/class_listing.inc:1729
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1737
+#: include/class_listing.inc:1738
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1738
+#: include/class_listing.inc:1739
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -2301,7 +2300,7 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr ""
 
@@ -2324,7 +2323,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:369 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3412,17 +3411,17 @@ msgid ""
 "\" as \"%2$s\" already depends on \"%1$s\""
 msgstr ""
 
-#: include/class_plugin.inc:1316
+#: include/class_plugin.inc:1319
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:292
+#: include/class_CopyPasteHandler.inc:303
 #: ihtml/themes/default/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:359
+#: include/class_CopyPasteHandler.inc:370
 msgid "Cannot paste"
 msgstr ""
 
@@ -3522,39 +3521,39 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:260
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:261
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:262
+#: include/simpleplugin/class_helpersAttribute.inc:266
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_helpersAttribute.inc:267
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:275
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:276
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:277
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
@@ -3739,17 +3738,18 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
@@ -3798,68 +3798,72 @@ msgstr ""
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:333
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:475
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:485
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:522
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr ""
 
-#: html/main.php:113
+#: html/main.php:115
 msgid "PHP configuration"
 msgstr ""
 
-#: html/main.php:114
+#: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Password change"
 msgstr ""
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:205
+#: html/main.php:158
+msgid "Your password has expired, please set a new one."
+msgstr ""
+
+#: html/main.php:208
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:248
+#: html/main.php:251
 msgid "User ACL checks disabled"
 msgstr ""
 
-#: html/main.php:286
+#: html/main.php:289
 msgid "Plugin"
 msgstr ""
 
-#: html/main.php:287
+#: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
 "a file)!"
 msgstr ""
 
-#: html/main.php:302
+#: html/main.php:305
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:303
+#: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
@@ -3876,53 +3880,45 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr ""
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr ""
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:68
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid ""
 "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4523,15 +4519,15 @@ msgid ""
 "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
 msgstr ""
 
-#: setup/class_setup.inc:127
+#: setup/class_setup.inc:122
 msgid "Setup error"
 msgstr ""
 
-#: setup/class_setup.inc:207
+#: setup/class_setup.inc:202
 msgid "Completed"
 msgstr ""
 
-#: setup/class_setup.inc:250
+#: setup/class_setup.inc:245
 msgid "Next"
 msgstr ""
 
@@ -4780,72 +4776,77 @@ msgstr ""
 msgid "Set"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
+#: ihtml/themes/default/recovery.tpl.c:8
+msgid "Lost password"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:11
-msgid "Lost password"
+msgid ""
+"Informations to reset password for %1 have been sent to email address %2"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:14
+msgid "Warning : this email is only valid for %1 minutes."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:17
 #: ihtml/themes/default/recovery.tpl.c:20
-#: ihtml/themes/default/recovery.tpl.c:62
-#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:32
 #: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:41
-#: ihtml/themes/default/recovery.tpl.c:74
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:44
-#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/recovery.tpl.c:53
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
+"=> Use your e-mail in the long format, e.g : John Doe => john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:71
-msgid "Mail"
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
diff --git a/locale/es/fusiondirectory.po b/locale/es/fusiondirectory.po
index 687d88e2e76922bc32a1d447c2ea89fe3fec6cca..51f00473b6fa7ce43ccdf82ea84a841d017a5fdb 100644
--- a/locale/es/fusiondirectory.po
+++ b/locale/es/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-10 13:25+0200\n"
-"PO-Revision-Date: 2016-06-03 11:03+0000\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
+"PO-Revision-Date: 2016-06-25 10:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -144,7 +144,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_group.inc:73
 #: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:414
 msgid "GID"
 msgstr "GID"
 
@@ -201,11 +201,10 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467 include/functions.inc:799
+#: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:520 html/class_passwordRecovery.inc:169
-#: setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -217,7 +216,7 @@ msgid "Warning"
 msgstr "Aviso"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr "Tiempo de espera agotado esperando un bloqueo. Â¡Ignorando bloqueo!"
 
@@ -562,7 +561,7 @@ msgstr "Nombre de pila"
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr "Inicio"
 
@@ -933,7 +932,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1151,8 +1150,8 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:654
-#: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nueva contraseÃ±a"
 
@@ -1337,11 +1336,11 @@ msgstr "la contraseÃ±a expirÃ³"
 msgid "password not changeable"
 msgstr "no puede cambiar la contraseÃ±a"
 
-#: plugins/personal/posix/class_posixAccount.inc:408
+#: plugins/personal/posix/class_posixAccount.inc:411
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:530
 #, php-format
 msgid "Group of user %s"
 msgstr ""
@@ -1583,7 +1582,7 @@ msgid "Session lifetime"
 msgstr "DuraciÃ³n de sesiones."
 
 #: plugins/config/class_configInLdap.inc:207
-msgid "Defines when a session will expire in seconds."
+msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:212
@@ -2164,7 +2163,7 @@ msgstr "Seleccione todos"
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:790
-#: include/class_plugin.inc:1518 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1521 include/class_CopyPasteHandler.inc:276
 #: include/simpleplugin/class_attribute.inc:1571
 #: include/simpleplugin/class_attribute.inc:1574
 #: include/simpleplugin/class_attribute.inc:1577
@@ -2177,7 +2176,7 @@ msgstr "Seleccione todos"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:471 html/index.php:481
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2301,7 +2300,7 @@ msgstr "Error XML en fusiondirectory.conf: %s en la lÃnea %d"
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr "Error en la configuraciÃ³n"
 
@@ -2323,7 +2322,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:367 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3415,7 +3414,7 @@ msgid ""
 "\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
 msgstr ""
 
-#: include/class_plugin.inc:1316
+#: include/class_plugin.inc:1319
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3525,39 +3524,39 @@ msgstr "Ninguno"
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: include/simpleplugin/class_helpersAttribute.inc:260
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:261
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:262
+#: include/simpleplugin/class_helpersAttribute.inc:266
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_helpersAttribute.inc:267
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:275
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr "segundos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:276
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr "minutos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:277
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr "horas"
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr "dÃas"
 
@@ -3740,127 +3739,132 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr "Â¡Se ha indicado un objectType vacio o no vÃ¡lido!"
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
-msgstr "Â¡La sesiÃ³n no es codificada!"
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
+msgstr ""
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
-msgstr "El tiempo de vida de sesiÃ³n es su fusiondirectory.conf sera sustituido por el valor de ini de php."
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
+msgstr ""
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:172
+#: html/index.php:171
 msgid "Smarty error"
 msgstr "Error Smarty"
 
-#: html/index.php:174
+#: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:209
+#: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
 msgstr "Su sesiÃ³n de FusionDirectory ha expirado!"
 
-#: html/index.php:212
+#: html/index.php:211
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:214
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:218
+#: html/index.php:217
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:279
+#: html/index.php:278
 msgid "Please specify a valid username!"
 msgstr "Â¡Por favor introduzca un nombre de usuario vÃ¡lido!"
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify your password!"
 msgstr "Â¡Por favor introduzca una contraseÃ±a!"
 
-#: html/index.php:301
+#: html/index.php:300
 msgid "Please check the username/password combination."
 msgstr "Por favor compruebe la combinaciÃ³n nombre de usuario/contraseÃ±a"
 
-#: html/index.php:331
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Cuenta bloqueada. Â¡Por favor contacte con su administrador de sistemas!"
 
-#: html/index.php:473
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:483
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:520
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr "Su navegador tiene las cookies desactivadas. Â¡Porfavor active las cookies y recargue esta pÃ¡gina antes de iniciar sesiÃ³n!"
 
-#: html/main.php:113
+#: html/main.php:115
 msgid "PHP configuration"
 msgstr "ConfiguraciÃ³n PHP"
 
-#: html/main.php:114
+#: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr "Error Fatal: 'Register globals' estÃ¡ activado. No se permitirÃ¡ ningun acceso hasta que esto sea solucionado por un administrador."
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Password change"
 msgstr "Cambio de contraseÃ±a"
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
 msgstr "Su contraseÃ±a va a caducar prÃ³ximamente, Â¡Por favor cambie su contraseÃ±a!"
 
-#: html/main.php:205
+#: html/main.php:158
+msgid "Your password has expired, please set a new one."
+msgstr ""
+
+#: html/main.php:208
 msgid "Running out of memory!"
 msgstr "Â¡Funcionando sin memoria!"
 
-#: html/main.php:248
+#: html/main.php:251
 msgid "User ACL checks disabled"
 msgstr "Desactivados chequeos de ACL de usuario"
 
-#: html/main.php:286
+#: html/main.php:289
 msgid "Plugin"
 msgstr "ExtensiÃ³n"
 
-#: html/main.php:287
+#: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
 msgstr ""
 
-#: html/main.php:302
+#: html/main.php:305
 msgid "Configuration Error"
 msgstr "Error de configuraciÃ³n"
 
-#: html/main.php:303
+#: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
@@ -3877,52 +3881,44 @@ msgstr "La configuraciÃ³n de FusionDirectory %s/%s no se puede leer. Cancelado."
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "Â¡No se puede acceder a el directorio de compilaciÃ³n '%s'!"
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr "La sesiÃ³n no serÃ¡ codificada."
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr "Entrar en sesiÃ³n SSL"
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:68
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr "DirecciÃ³n de correo"
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr "Contacte a su administrador, hubo un problema con el servidor de correo"
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr "Esta prenda es invalida"
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4523,15 +4519,15 @@ msgid ""
 "'Off'."
 msgstr "Busque 'zend.ze1_compatibility_mode' en su php.ini y modifÃquelo a 'Off'."
 
-#: setup/class_setup.inc:127
+#: setup/class_setup.inc:122
 msgid "Setup error"
 msgstr "Error de configuraciÃ³n"
 
-#: setup/class_setup.inc:207
+#: setup/class_setup.inc:202
 msgid "Completed"
 msgstr "Completado"
 
-#: setup/class_setup.inc:250
+#: setup/class_setup.inc:245
 msgid "Next"
 msgstr "Siguiente"
 
@@ -4780,72 +4776,78 @@ msgstr "ignore este error y muestre todas las entradas que coincidan con el tama
 msgid "Set"
 msgstr "Activar"
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
-msgstr "RecuperaciÃ³n de clave FusionDirectory"
-
-#: ihtml/themes/default/recovery.tpl.c:11
+#: ihtml/themes/default/recovery.tpl.c:8
 msgid "Lost password"
 msgstr "Clave extraviada"
 
+#: ihtml/themes/default/recovery.tpl.c:11
+msgid ""
+"Informations to reset password for %1 have been sent to email address %2"
+msgstr ""
+
 #: ihtml/themes/default/recovery.tpl.c:14
+msgid "Warning : this email is only valid for %1 minutes."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr "Este dialogo provee un mÃ©todo sencillo para cambiar su clave. Introduzca la clave nueva (dos veces) en los campos debajo y presione el botÃ³n 'Cambiar'."
 
-#: ihtml/themes/default/recovery.tpl.c:17
 #: ihtml/themes/default/recovery.tpl.c:20
-#: ihtml/themes/default/recovery.tpl.c:62
-#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr "Directorio"
 
-#: ihtml/themes/default/recovery.tpl.c:32
 #: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "Repita la nueva contraseÃ±a"
 
-#: ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr "Resistencia de la contraseÃ±a"
 
-#: ihtml/themes/default/recovery.tpl.c:41
-#: ihtml/themes/default/recovery.tpl.c:74
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr "Cambiar"
 
-#: ihtml/themes/default/recovery.tpl.c:44
-#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr "Pulse aquÃ para cambiar su contraseÃ±a"
 
-#: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/recovery.tpl.c:53
 msgid "Success"
 msgstr "Correcto"
 
-#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr "Su contraseÃ±a se ha cambiado correctamente."
 
-#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr "Introduzca su direcciÃ³n de correo actual en el campo debajo y presione el botÃ³n 'Cambiar'"
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
-msgstr "=> Utilice el formato largo de su correo, ej: Pedro PÃ©rez => pedro.perez@dominio.com"
+"=> Use your e-mail in the long format, e.g : John Doe => "
+"john.doe@example.com"
+msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:71
-msgid "Mail"
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
 msgstr "Correo ElectrÃ³nico"
 
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
diff --git a/locale/es_CO/fusiondirectory.po b/locale/es_CO/fusiondirectory.po
index 3c1acd35358d8c58d52cb52e6a139a5224a8d0f0..cf6133a7ca5ae26a9688b456a948b563f5b109bf 100644
--- a/locale/es_CO/fusiondirectory.po
+++ b/locale/es_CO/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-10 13:25+0200\n"
-"PO-Revision-Date: 2016-06-03 11:03+0000\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
+"PO-Revision-Date: 2016-06-25 10:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -145,7 +145,7 @@ msgstr "Forzar GID para este grupo"
 
 #: plugins/admin/groups/class_group.inc:73
 #: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:414
 msgid "GID"
 msgstr "GID"
 
@@ -202,11 +202,10 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr "Habilitar solamente a Ã©ste grupo para conectarse a Ã©sta lista de equipos."
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467 include/functions.inc:799
+#: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:520 html/class_passwordRecovery.inc:169
-#: setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -218,7 +217,7 @@ msgid "Warning"
 msgstr "Advertencia"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr "Tiempo de espera superado mientras se esperaba el bloqueo. Â¡Ignorando el bloqueo!"
 
@@ -563,7 +562,7 @@ msgstr "Nombre"
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr "Cuenta de usuario"
 
@@ -934,7 +933,7 @@ msgstr "Tipo de 'hash' para la contraseÃ±a"
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1152,8 +1151,8 @@ msgid ""
 msgstr "Las contraseÃ±as que usted ingresÃ³ como \"Nueva contraseÃ±a\" y \"Repetir nueva contraseÃ±a\" no coinciden."
 
 #: plugins/personal/generic/class_user.inc:654
-#: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nueva contraseÃ±a"
 
@@ -1338,11 +1337,11 @@ msgstr "ContraseÃ±a expirada"
 msgid "password not changeable"
 msgstr "ContraseÃ±a no modificable"
 
-#: plugins/personal/posix/class_posixAccount.inc:408
+#: plugins/personal/posix/class_posixAccount.inc:411
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:530
 #, php-format
 msgid "Group of user %s"
 msgstr "Grupo del usuario %s"
@@ -1584,8 +1583,8 @@ msgid "Session lifetime"
 msgstr "Tiempo de vida de la sesiÃ³n "
 
 #: plugins/config/class_configInLdap.inc:207
-msgid "Defines when a session will expire in seconds."
-msgstr "Determina cuando una sesiÃ³n va a expirar (en segundos)"
+msgid "Defines when a session will expire in seconds (0 to disable)."
+msgstr ""
 
 #: plugins/config/class_configInLdap.inc:212
 msgid "HTTP authentication"
@@ -2165,7 +2164,7 @@ msgstr "Seleccionar todo"
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:790
-#: include/class_plugin.inc:1518 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1521 include/class_CopyPasteHandler.inc:276
 #: include/simpleplugin/class_attribute.inc:1571
 #: include/simpleplugin/class_attribute.inc:1574
 #: include/simpleplugin/class_attribute.inc:1577
@@ -2178,7 +2177,7 @@ msgstr "Seleccionar todo"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:471 html/index.php:481
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2302,7 +2301,7 @@ msgstr "Error XML en fusiondirectory.conf: %s en la lÃnea %d"
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr "Error de configuraciÃ³n"
 
@@ -2324,7 +2323,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:367 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3416,7 +3415,7 @@ msgid ""
 "\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
 msgstr ""
 
-#: include/class_plugin.inc:1316
+#: include/class_plugin.inc:1319
 #, php-format
 msgid "Tab \"%s\""
 msgstr "PestaÃ±a \"%s\""
@@ -3526,39 +3525,39 @@ msgstr "Ninguno"
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: include/simpleplugin/class_helpersAttribute.inc:260
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:261
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "KiB"
 msgstr "KB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:262
+#: include/simpleplugin/class_helpersAttribute.inc:266
 msgid "MiB"
 msgstr "MB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_helpersAttribute.inc:267
 msgid "GiB"
 msgstr "GB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "TiB"
 msgstr "TB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:275
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr "segundos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:276
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr "minutos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:277
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr "horas"
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr "dÃas"
 
@@ -3741,127 +3740,132 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr "Â¡El objectType especificado estÃ¡ vacÃo o es invÃ¡lido!"
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
-msgstr "Â¡Ã‰sta sesiÃ³n no estÃ¡ encriptada!"
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
+msgstr ""
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
-msgstr "El tiempo de vida de la sesiÃ³n configurado en su archivo 'fusiondirectory.conf ' serÃ¡ superado por la configuraciÃ³n en el archivo 'php.ini'."
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
+msgstr ""
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr "El archivo de configuraciÃ³n de FusionDirectory  %s/%s no tiene privilegios de lectura. Por favor ejecute \"fusiondirectory-setup --check-config\" para corregir Ã©ste problema."
 
-#: html/index.php:172
+#: html/index.php:171
 msgid "Smarty error"
 msgstr "Error en Smarty"
 
-#: html/index.php:174
+#: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:209
+#: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
 msgstr "Â¡Su sesiÃ³n de FusionDirectory ha expirado!"
 
-#: html/index.php:212
+#: html/index.php:211
 msgid "Your IP has changed!"
 msgstr "Â¡Tu IP ha cambiado!"
 
-#: html/index.php:215
+#: html/index.php:214
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr "Â¡ParÃ¡metro \"%s\" de plugin invÃ¡lido!"
 
-#: html/index.php:218
+#: html/index.php:217
 msgid "No session found!"
 msgstr "Â¡No se encuentra la sesiÃ³n!"
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:279
+#: html/index.php:278
 msgid "Please specify a valid username!"
 msgstr "Â¡Por favor especifique un nombre de usuario vÃ¡lido!"
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify your password!"
 msgstr "Â¡Por favor especifique su contraseÃ±a!"
 
-#: html/index.php:301
+#: html/index.php:300
 msgid "Please check the username/password combination."
 msgstr "Por favor verifique su combinaciÃ³n de usuario/contraseÃ±a"
 
-#: html/index.php:331
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Cuenta bloqueada. Â¡Por favor contacte a su administrador!"
 
-#: html/index.php:473
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:483
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:520
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr "Su navegador tiene las cookies deshabilitadas. Â¡Por favor habilÃtelas y recarge la pÃ¡gina antes de iniciar sesiÃ³n!"
 
-#: html/main.php:113
+#: html/main.php:115
 msgid "PHP configuration"
 msgstr "ConfiguraciÃ³n PHP"
 
-#: html/main.php:114
+#: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr "Error fatal: Registrar 'globales' estÃ¡ habilitado. FusionDirectory rechazarÃ¡ el inicio de sesiÃ³n hasta que esto sea solucionado por un administrador."
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Password change"
 msgstr "Cambio de contraseÃ±a"
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
 msgstr "Su contraseÃ±a estÃ¡ a punto de expirar, Â¡por favor cambie su contraseÃ±a!"
 
-#: html/main.php:205
+#: html/main.php:158
+msgid "Your password has expired, please set a new one."
+msgstr ""
+
+#: html/main.php:208
 msgid "Running out of memory!"
 msgstr "Â¡El sistema se estÃ¡ quedando sin memoria!"
 
-#: html/main.php:248
+#: html/main.php:251
 msgid "User ACL checks disabled"
 msgstr "Checks  ACL de usuario deshabiltiados"
 
-#: html/main.php:286
+#: html/main.php:289
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/main.php:287
+#: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
 msgstr "Error Fatal: Â¡No es posible encontrar ninguna definiciÃ³n de plugin para el plugin '%s' ('%s' no es un archivo)!"
 
-#: html/main.php:302
+#: html/main.php:305
 msgid "Configuration Error"
 msgstr "Error de configuraciÃ³n"
 
-#: html/main.php:303
+#: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
@@ -3878,52 +3882,44 @@ msgstr "La configuraciÃ³n %s/%s de FusionDirectory no tiene permisos de lectura.
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "Â¡No se puede acceder al directorio '%s' especificado para compilar!"
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr "La sesiÃ³n no serÃ¡ encriptada."
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr "Ingresar sesiÃ³n SSL"
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr "No se encontrÃ³ la cuenta de usuario: \"%s\""
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr "Se encontraron varias cuentas identificadas como: \"%s\""
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:68
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr "DirecciÃ³n de correo"
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr "Contacte a su administrador, hubo un problema con el servidor de correo."
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr "Este token es invÃ¡lido"
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr "Hay un problema con el servidor de correo, la confirmaciÃ³n de email no serÃ¡ enviada."
 
@@ -4524,15 +4520,15 @@ msgid ""
 "'Off'."
 msgstr "Busca  'zend.ze1_compatibility_mode' en su archivo php.ini y lo establece como 'Off'."
 
-#: setup/class_setup.inc:127
+#: setup/class_setup.inc:122
 msgid "Setup error"
 msgstr "Error en la configuraciÃ³n"
 
-#: setup/class_setup.inc:207
+#: setup/class_setup.inc:202
 msgid "Completed"
 msgstr "Completado"
 
-#: setup/class_setup.inc:250
+#: setup/class_setup.inc:245
 msgid "Next"
 msgstr "Siguiente"
 
@@ -4781,72 +4777,78 @@ msgstr "ignore este error y muestre todas las entradas que cumplen con el tamaÃ±
 msgid "Set"
 msgstr "Asignar"
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
-msgstr "FusionDirectory RecuperaciÃ³n de contraseÃ±a"
-
-#: ihtml/themes/default/recovery.tpl.c:11
+#: ihtml/themes/default/recovery.tpl.c:8
 msgid "Lost password"
 msgstr "Recuperar contraseÃ±a"
 
+#: ihtml/themes/default/recovery.tpl.c:11
+msgid ""
+"Informations to reset password for %1 have been sent to email address %2"
+msgstr ""
+
 #: ihtml/themes/default/recovery.tpl.c:14
+msgid "Warning : this email is only valid for %1 minutes."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr "Esta opciÃ³n le ofrece una forma simple de cambiar su contraseÃ±a. Ingrese la nueva contraseÃ±a (dos veces) en los campos justo debajo y luego presione el botÃ³n 'Cambiar'. "
 
-#: ihtml/themes/default/recovery.tpl.c:17
 #: ihtml/themes/default/recovery.tpl.c:20
-#: ihtml/themes/default/recovery.tpl.c:62
-#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr "Directorio"
 
-#: ihtml/themes/default/recovery.tpl.c:32
 #: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "Repetir nueva contraseÃ±a"
 
-#: ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr "Seguridad de la contraseÃ±a"
 
-#: ihtml/themes/default/recovery.tpl.c:41
-#: ihtml/themes/default/recovery.tpl.c:74
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr "Cambio"
 
-#: ihtml/themes/default/recovery.tpl.c:44
-#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr "Clic aquÃ para cambiar su contraseÃ±a"
 
-#: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/recovery.tpl.c:53
 msgid "Success"
 msgstr "Realizado con Ã©xito"
 
-#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr "Su contraseÃ±a ha sido cambiada con Ã©xito."
 
-#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr "Ingrese su direcciÃ³n de correo actual en el siguiente campo y presione el botÃ³n 'Cambiar'."
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
-msgstr "=> Use su correo en formato extendido, ej. :  John Doe => john.doe@ibcp.fr"
+"=> Use your e-mail in the long format, e.g : John Doe => "
+"john.doe@example.com"
+msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:71
-msgid "Mail"
-msgstr "Correo"
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
+msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
diff --git a/locale/es_VE/fusiondirectory.po b/locale/es_VE/fusiondirectory.po
index 6168544be5ad36e3e7c22852f1dcda03ab046ebd..c075e0d18054cc06ea303fd2c6ac5ad108aac7db 100644
--- a/locale/es_VE/fusiondirectory.po
+++ b/locale/es_VE/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-10 13:25+0200\n"
-"PO-Revision-Date: 2016-06-03 11:03+0000\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
+"PO-Revision-Date: 2016-06-25 10:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/es_VE/)\n"
 "MIME-Version: 1.0\n"
@@ -144,7 +144,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_group.inc:73
 #: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:414
 msgid "GID"
 msgstr "GID"
 
@@ -201,11 +201,10 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467 include/functions.inc:799
+#: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:520 html/class_passwordRecovery.inc:169
-#: setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -217,7 +216,7 @@ msgid "Warning"
 msgstr "Aviso"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr "Tiempo de espera agotado esperando un bloqueo. Â¡Ignorando bloqueo!"
 
@@ -562,7 +561,7 @@ msgstr "Nombre de pila"
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr "Inicio"
 
@@ -933,7 +932,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1151,8 +1150,8 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:654
-#: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nueva contraseÃ±a"
 
@@ -1337,11 +1336,11 @@ msgstr "la contraseÃ±a expirÃ³"
 msgid "password not changeable"
 msgstr "no puede cambiar la contraseÃ±a"
 
-#: plugins/personal/posix/class_posixAccount.inc:408
+#: plugins/personal/posix/class_posixAccount.inc:411
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:530
 #, php-format
 msgid "Group of user %s"
 msgstr ""
@@ -1583,7 +1582,7 @@ msgid "Session lifetime"
 msgstr "DuraciÃ³n de sesiones."
 
 #: plugins/config/class_configInLdap.inc:207
-msgid "Defines when a session will expire in seconds."
+msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:212
@@ -2164,7 +2163,7 @@ msgstr "Seleccione todos"
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:790
-#: include/class_plugin.inc:1518 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1521 include/class_CopyPasteHandler.inc:276
 #: include/simpleplugin/class_attribute.inc:1571
 #: include/simpleplugin/class_attribute.inc:1574
 #: include/simpleplugin/class_attribute.inc:1577
@@ -2177,7 +2176,7 @@ msgstr "Seleccione todos"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:471 html/index.php:481
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2301,7 +2300,7 @@ msgstr "Error XML en fusiondirectory.conf: %s en la lÃnea %d"
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr "Error en la configuraciÃ³n"
 
@@ -2323,7 +2322,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:367 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3415,7 +3414,7 @@ msgid ""
 "\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
 msgstr ""
 
-#: include/class_plugin.inc:1316
+#: include/class_plugin.inc:1319
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3525,39 +3524,39 @@ msgstr "Ninguno"
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: include/simpleplugin/class_helpersAttribute.inc:260
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:261
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:262
+#: include/simpleplugin/class_helpersAttribute.inc:266
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_helpersAttribute.inc:267
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:275
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr "segundos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:276
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr "minutos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:277
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr "horas"
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr "dÃas"
 
@@ -3740,127 +3739,132 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr "Â¡Se ha indicado un objectType vacio o no vÃ¡lido!"
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
-msgstr "Â¡La sesiÃ³n no es codificada!"
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
+msgstr ""
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
-msgstr "El tiempo de vida de sesiÃ³n es su fusiondirectory.conf sera sustituido por el valor de ini de php."
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
+msgstr ""
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:172
+#: html/index.php:171
 msgid "Smarty error"
 msgstr "Error Smarty"
 
-#: html/index.php:174
+#: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:209
+#: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
 msgstr "Su sesiÃ³n de FusionDirectory ha expirado!"
 
-#: html/index.php:212
+#: html/index.php:211
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:214
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:218
+#: html/index.php:217
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:279
+#: html/index.php:278
 msgid "Please specify a valid username!"
 msgstr "Â¡Por favor introduzca un nombre de usuario vÃ¡lido!"
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify your password!"
 msgstr "Â¡Por favor introduzca una contraseÃ±a!"
 
-#: html/index.php:301
+#: html/index.php:300
 msgid "Please check the username/password combination."
 msgstr "Por favor compruebe la combinaciÃ³n nombre de usuario/contraseÃ±a"
 
-#: html/index.php:331
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Cuenta bloqueada. Â¡Por favor contacte con su administrador de sistemas!"
 
-#: html/index.php:473
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:483
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:520
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr "Su navegador tiene las cookies desactivadas. Â¡Porfavor active las cookies y recargue esta pÃ¡gina antes de iniciar sesiÃ³n!"
 
-#: html/main.php:113
+#: html/main.php:115
 msgid "PHP configuration"
 msgstr "ConfiguraciÃ³n PHP"
 
-#: html/main.php:114
+#: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr "Error Fatal: 'Register globals' estÃ¡ activado. No se permitirÃ¡ ningun acceso hasta que esto sea solucionado por un administrador."
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Password change"
 msgstr "Cambio de contraseÃ±a"
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
 msgstr "Su contraseÃ±a va a caducar prÃ³ximamente, Â¡Por favor cambie su contraseÃ±a!"
 
-#: html/main.php:205
+#: html/main.php:158
+msgid "Your password has expired, please set a new one."
+msgstr ""
+
+#: html/main.php:208
 msgid "Running out of memory!"
 msgstr "Â¡Funcionando sin memoria!"
 
-#: html/main.php:248
+#: html/main.php:251
 msgid "User ACL checks disabled"
 msgstr "Desactivados chequeos de ACL de usuario"
 
-#: html/main.php:286
+#: html/main.php:289
 msgid "Plugin"
 msgstr "ExtensiÃ³n"
 
-#: html/main.php:287
+#: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
 msgstr ""
 
-#: html/main.php:302
+#: html/main.php:305
 msgid "Configuration Error"
 msgstr "Error de configuraciÃ³n"
 
-#: html/main.php:303
+#: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
@@ -3877,52 +3881,44 @@ msgstr "La configuraciÃ³n de FusionDirectory %s/%s no se puede leer. Cancelado."
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "Â¡No se puede acceder a el directorio de compilaciÃ³n '%s'!"
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr "La sesiÃ³n no serÃ¡ codificada."
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr "Entrar en sesiÃ³n SSL"
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:68
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr "DirecciÃ³n de correo"
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr "Contacte a su administrador, hubo un problema con el servidor de correo"
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr "Esta prenda es invalida"
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4523,15 +4519,15 @@ msgid ""
 "'Off'."
 msgstr "Busque 'zend.ze1_compatibility_mode' en su php.ini y modifÃquelo a 'Off'."
 
-#: setup/class_setup.inc:127
+#: setup/class_setup.inc:122
 msgid "Setup error"
 msgstr "Error de configuraciÃ³n"
 
-#: setup/class_setup.inc:207
+#: setup/class_setup.inc:202
 msgid "Completed"
 msgstr "Completado"
 
-#: setup/class_setup.inc:250
+#: setup/class_setup.inc:245
 msgid "Next"
 msgstr "Siguiente"
 
@@ -4780,72 +4776,78 @@ msgstr "ignore este error y muestre todas las entradas que coincidan con el tama
 msgid "Set"
 msgstr "Activar"
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
-msgstr "RecuperaciÃ³n de clave FusionDirectory"
-
-#: ihtml/themes/default/recovery.tpl.c:11
+#: ihtml/themes/default/recovery.tpl.c:8
 msgid "Lost password"
 msgstr "Clave extraviada"
 
+#: ihtml/themes/default/recovery.tpl.c:11
+msgid ""
+"Informations to reset password for %1 have been sent to email address %2"
+msgstr ""
+
 #: ihtml/themes/default/recovery.tpl.c:14
+msgid "Warning : this email is only valid for %1 minutes."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr "Este dialogo provee un mÃ©todo sencillo para cambiar su clave. Introduzca la clave nueva (dos veces) en los campos debajo y presione el botÃ³n 'Cambiar'."
 
-#: ihtml/themes/default/recovery.tpl.c:17
 #: ihtml/themes/default/recovery.tpl.c:20
-#: ihtml/themes/default/recovery.tpl.c:62
-#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr "Directorio"
 
-#: ihtml/themes/default/recovery.tpl.c:32
 #: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "Repita la nueva contraseÃ±a"
 
-#: ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr "Resistencia de la contraseÃ±a"
 
-#: ihtml/themes/default/recovery.tpl.c:41
-#: ihtml/themes/default/recovery.tpl.c:74
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr "Cambiar"
 
-#: ihtml/themes/default/recovery.tpl.c:44
-#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr "Pulse aquÃ para cambiar su contraseÃ±a"
 
-#: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/recovery.tpl.c:53
 msgid "Success"
 msgstr "Correcto"
 
-#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr "Su contraseÃ±a se ha cambiado correctamente."
 
-#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr "Introduzca su direcciÃ³n de correo actual en el campo debajo y presione el botÃ³n 'Cambiar'"
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
-msgstr "=> Utilice el formato largo de su correo, ej: Pedro PÃ©rez => pedro.perez@dominio.com"
+"=> Use your e-mail in the long format, e.g : John Doe => "
+"john.doe@example.com"
+msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:71
-msgid "Mail"
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
 msgstr "Correo ElectrÃ³nico"
 
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
diff --git a/locale/fa_IR/fusiondirectory.po b/locale/fa_IR/fusiondirectory.po
index 4de44e069a5f8e21b1a93a4dd621e3f90f17d45b..dde4cc90be4f11d0fef62823ef94fa82b50e9b99 100644
--- a/locale/fa_IR/fusiondirectory.po
+++ b/locale/fa_IR/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-10 13:25+0200\n"
-"PO-Revision-Date: 2016-06-03 11:03+0000\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
+"PO-Revision-Date: 2016-06-25 10:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
@@ -144,7 +144,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_group.inc:73
 #: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:414
 msgid "GID"
 msgstr ""
 
@@ -201,11 +201,10 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467 include/functions.inc:799
+#: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:520 html/class_passwordRecovery.inc:169
-#: setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -217,7 +216,7 @@ msgid "Warning"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
@@ -562,7 +561,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr ""
 
@@ -933,7 +932,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1151,8 +1150,8 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:654
-#: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:32
 msgid "New password"
 msgstr "Ú©Ù„Ù…Ù‡ Ø¹Ø¨ÙˆØ± Ø¬Ø¯ÛŒØ¯"
 
@@ -1337,11 +1336,11 @@ msgstr ""
 msgid "password not changeable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:408
+#: plugins/personal/posix/class_posixAccount.inc:411
 msgid "UID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:530
 #, php-format
 msgid "Group of user %s"
 msgstr ""
@@ -1583,7 +1582,7 @@ msgid "Session lifetime"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:207
-msgid "Defines when a session will expire in seconds."
+msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:212
@@ -2164,7 +2163,7 @@ msgstr ""
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:790
-#: include/class_plugin.inc:1518 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1521 include/class_CopyPasteHandler.inc:276
 #: include/simpleplugin/class_attribute.inc:1571
 #: include/simpleplugin/class_attribute.inc:1574
 #: include/simpleplugin/class_attribute.inc:1577
@@ -2177,7 +2176,7 @@ msgstr ""
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:471 html/index.php:481
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2301,7 +2300,7 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr ""
 
@@ -2323,7 +2322,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:367 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3415,7 +3414,7 @@ msgid ""
 "\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
 msgstr ""
 
-#: include/class_plugin.inc:1316
+#: include/class_plugin.inc:1319
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3525,39 +3524,39 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:260
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:261
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:262
+#: include/simpleplugin/class_helpersAttribute.inc:266
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_helpersAttribute.inc:267
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:275
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:276
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:277
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
@@ -3740,127 +3739,132 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:172
+#: html/index.php:171
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:174
+#: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:209
+#: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:212
+#: html/index.php:211
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:214
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:218
+#: html/index.php:217
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:279
+#: html/index.php:278
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:301
+#: html/index.php:300
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:331
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:473
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:483
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:520
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr ""
 
-#: html/main.php:113
+#: html/main.php:115
 msgid "PHP configuration"
 msgstr "Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ PHP"
 
-#: html/main.php:114
+#: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Password change"
 msgstr "ØªØºÛŒÛŒØ± Ú©Ù„Ù…Ù‡ Ø¹Ø¨ÙˆØ±"
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
 msgstr "Ø§Ø¹ØªØ¨Ø§Ø± Ú©Ù„Ù…Ù‡ Ø¹Ø¨ÙˆØ± Ø´Ù…Ø§ Ø¯Ø± ØØ§Ù„ Ø§ØªÙ…Ø§Ù… Ø§Ø³ØªØŒ Ù„Ø·ÙØ§ Ú©Ù„Ù…Ù‡ Ø¹Ø¨ÙˆØ± Ø®ÙˆØ¯ Ø±Ø§ ØªØºÛŒÛŒØ± Ø¯Ù‡ÛŒØ¯!"
 
-#: html/main.php:205
+#: html/main.php:158
+msgid "Your password has expired, please set a new one."
+msgstr ""
+
+#: html/main.php:208
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:248
+#: html/main.php:251
 msgid "User ACL checks disabled"
 msgstr ""
 
-#: html/main.php:286
+#: html/main.php:289
 msgid "Plugin"
 msgstr "Ù¾Ù„Ø§Ú¯ÛŒÙ†"
 
-#: html/main.php:287
+#: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
 msgstr ""
 
-#: html/main.php:302
+#: html/main.php:305
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:303
+#: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
@@ -3877,52 +3881,44 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr ""
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr ""
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:68
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4523,15 +4519,15 @@ msgid ""
 "'Off'."
 msgstr ""
 
-#: setup/class_setup.inc:127
+#: setup/class_setup.inc:122
 msgid "Setup error"
 msgstr ""
 
-#: setup/class_setup.inc:207
+#: setup/class_setup.inc:202
 msgid "Completed"
 msgstr ""
 
-#: setup/class_setup.inc:250
+#: setup/class_setup.inc:245
 msgid "Next"
 msgstr ""
 
@@ -4773,72 +4769,78 @@ msgstr ""
 msgid "Set"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
+#: ihtml/themes/default/recovery.tpl.c:8
+msgid "Lost password"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:11
-msgid "Lost password"
+msgid ""
+"Informations to reset password for %1 have been sent to email address %2"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:14
+msgid "Warning : this email is only valid for %1 minutes."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:17
 #: ihtml/themes/default/recovery.tpl.c:20
-#: ihtml/themes/default/recovery.tpl.c:62
-#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:32
 #: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:41
-#: ihtml/themes/default/recovery.tpl.c:74
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:44
-#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/recovery.tpl.c:53
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
+"=> Use your e-mail in the long format, e.g : John Doe => "
+"john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:71
-msgid "Mail"
-msgstr ""
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
+msgstr "Ù¾Ø³Øª Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ©"
 
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
diff --git a/locale/fi_FI/fusiondirectory.po b/locale/fi_FI/fusiondirectory.po
index f691099c7ea661b03eafa3902c57c96d242a0fa4..b353037eb8a09bfb4cc93e47eed55982640afe78 100644
--- a/locale/fi_FI/fusiondirectory.po
+++ b/locale/fi_FI/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-23 22:48+0200\n"
-"PO-Revision-Date: 2016-06-23 20:45+0000\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
+"PO-Revision-Date: 2016-06-25 10:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -60,7 +60,7 @@ msgstr ""
 #: include/select/groupSelect/group-filter.tpl.c:14
 #: setup/setup_migrate_adminAccount.tpl.c:8
 msgid "Name"
-msgstr ""
+msgstr "Nimi"
 
 #: plugins/admin/groups/class_roleGeneric.inc:86
 #: plugins/admin/groups/class_group.inc:60
@@ -203,9 +203,8 @@ msgstr ""
 #: plugins/admin/groups/class_group.inc:181
 #: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:520 html/main.php:158
-#: html/class_passwordRecovery.inc:169 setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -478,16 +477,16 @@ msgstr ""
 #: plugins/admin/departments/class_department.inc:106
 #: plugins/personal/generic/class_user.inc:350
 msgid "Phone"
-msgstr ""
+msgstr "Puhelin"
 
 #: plugins/admin/departments/class_department.inc:106
 msgid "Telephone number"
-msgstr ""
+msgstr "Puhelinnumero"
 
 #: plugins/admin/departments/class_department.inc:110
 #: plugins/personal/generic/class_user.inc:362
 msgid "Fax"
-msgstr ""
+msgstr "Faksi"
 
 #: plugins/admin/departments/class_department.inc:110
 msgid "Facsimile telephone number"
@@ -556,13 +555,13 @@ msgstr ""
 
 #: plugins/admin/users/user-list.xml:41
 msgid "Given name"
-msgstr ""
+msgstr "Etunimi"
 
 #: plugins/admin/users/user-list.xml:49
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr ""
 
@@ -933,7 +932,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1008,7 +1007,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:354
 msgid "Mobile"
-msgstr ""
+msgstr "Mobiili"
 
 #: plugins/personal/generic/class_user.inc:354
 msgid "Business mobile number"
@@ -1151,8 +1150,8 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:654
+#: ihtml/themes/default/recovery.tpl.c:29
 #: ihtml/themes/default/recovery.tpl.c:32
-#: ihtml/themes/default/recovery.tpl.c:35
 msgid "New password"
 msgstr ""
 
@@ -2177,11 +2176,11 @@ msgstr ""
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:471 html/index.php:481
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
-msgstr ""
+msgstr "Virhe"
 
 #: include/class_listing.inc:579
 msgid "created by"
@@ -2301,7 +2300,7 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:208 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr ""
 
@@ -2323,7 +2322,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:367 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3740,80 +3739,81 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:172
+#: html/index.php:171
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:174
+#: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:209
+#: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:212
+#: html/index.php:211
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:214
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:218
+#: html/index.php:217
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:279
+#: html/index.php:278
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:301
+#: html/index.php:300
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:331
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:473
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:483
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:520
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -3881,52 +3881,44 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr ""
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr ""
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:74
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4784,81 +4776,78 @@ msgstr ""
 msgid "Set"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
-msgstr ""
-
-#: ihtml/themes/default/recovery.tpl.c:11
+#: ihtml/themes/default/recovery.tpl.c:8
 msgid "Lost password"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:14
+#: ihtml/themes/default/recovery.tpl.c:11
 msgid ""
 "Informations to reset password for %1 have been sent to email address %2"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:17
+#: ihtml/themes/default/recovery.tpl.c:14
 msgid "Warning : this email is only valid for %1 minutes."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:20
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
+#: ihtml/themes/default/recovery.tpl.c:20
 #: ihtml/themes/default/recovery.tpl.c:23
-#: ihtml/themes/default/recovery.tpl.c:26
-#: ihtml/themes/default/recovery.tpl.c:68
-#: ihtml/themes/default/recovery.tpl.c:71 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr ""
 
+#: ihtml/themes/default/recovery.tpl.c:35
 #: ihtml/themes/default/recovery.tpl.c:38
-#: ihtml/themes/default/recovery.tpl.c:41
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:47
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:50
-#: ihtml/themes/default/recovery.tpl.c:83
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr ""
 
+#: ihtml/themes/default/recovery.tpl.c:50
 #: ihtml/themes/default/recovery.tpl.c:53
-#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:62
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
+"=> Use your e-mail in the long format, e.g : John Doe => "
+"john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:77
-msgid "Mail"
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:86
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
@@ -5062,7 +5051,7 @@ msgstr ""
 
 #: setup/setup_migrate_adminAccount.tpl.c:11
 msgid "User ID"
-msgstr ""
+msgstr "KÃ¤yttÃ¤jÃ¤tunnus"
 
 #: setup/setup_migrate_adminAccount.tpl.c:17
 msgid "Password (again)"
diff --git a/locale/fr/fusiondirectory.po b/locale/fr/fusiondirectory.po
index c5cb051e823d25ef7387e700fe7f9f4a02875820..0a21e0ef2f35f29d2e87f20b58376722bb3afe64 100644
--- a/locale/fr/fusiondirectory.po
+++ b/locale/fr/fusiondirectory.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-10 13:25+0200\n"
-"PO-Revision-Date: 2016-06-09 08:52+0000\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
+"PO-Revision-Date: 2016-06-25 11:18+0000\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: French (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -147,7 +147,7 @@ msgstr "Forcer la valeur du GID pour ce groupe"
 
 #: plugins/admin/groups/class_group.inc:73
 #: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:414
 msgid "GID"
 msgstr "GID"
 
@@ -204,11 +204,10 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr "Autoriser ce groupe Ã  se connecter uniquement sur cette liste d'hÃ´tes"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467 include/functions.inc:799
+#: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:520 html/class_passwordRecovery.inc:169
-#: setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -220,7 +219,7 @@ msgid "Warning"
 msgstr "Avertissement"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr "Le temps d'attente du verrou a Ã©tÃ© dÃ©passÃ©. Verrou ignorÃ© !"
 
@@ -565,7 +564,7 @@ msgstr "PrÃ©nom"
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr "Identifiant"
 
@@ -936,7 +935,7 @@ msgstr "MÃ©thode de chiffrement des mots de passe"
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1154,8 +1153,8 @@ msgid ""
 msgstr "Les mots de passe entrÃ©s dans les champs 'Nouveau mot de passe' et celui dans le champ 'RÃ©pÃ©ter le nouveau mot de passe' ne concordent pas."
 
 #: plugins/personal/generic/class_user.inc:654
-#: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
@@ -1340,11 +1339,11 @@ msgstr "mot de passe expirÃ©"
 msgid "password not changeable"
 msgstr "mot de passe non modifiable"
 
-#: plugins/personal/posix/class_posixAccount.inc:408
+#: plugins/personal/posix/class_posixAccount.inc:411
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:530
 #, php-format
 msgid "Group of user %s"
 msgstr "Groupe de l'utilisateur %s"
@@ -1586,8 +1585,8 @@ msgid "Session lifetime"
 msgstr "DurÃ©e de vie de la session"
 
 #: plugins/config/class_configInLdap.inc:207
-msgid "Defines when a session will expire in seconds."
-msgstr "DÃ©finit la durÃ©e d'une session en secondes."
+msgid "Defines when a session will expire in seconds (0 to disable)."
+msgstr "DÃ©finit la durÃ©e d'une session en secondes (0 pour dÃ©sactiver)."
 
 #: plugins/config/class_configInLdap.inc:212
 msgid "HTTP authentication"
@@ -2167,7 +2166,7 @@ msgstr "SÃ©lectionner tout"
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:790
-#: include/class_plugin.inc:1518 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1521 include/class_CopyPasteHandler.inc:276
 #: include/simpleplugin/class_attribute.inc:1571
 #: include/simpleplugin/class_attribute.inc:1574
 #: include/simpleplugin/class_attribute.inc:1577
@@ -2180,7 +2179,7 @@ msgstr "SÃ©lectionner tout"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:471 html/index.php:481
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2304,7 +2303,7 @@ msgstr "Erreur XML dans fusiondirectory.confâ€¯: %s Ã  la ligne %d"
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr "Erreur de configuration"
 
@@ -2326,7 +2325,7 @@ msgstr "Il semble que vous essayez de dÃ©chiffrer quelque chose qui n'est pas ch
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:367 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3418,7 +3417,7 @@ msgid ""
 "\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
 msgstr "DÃ©pendance rÃ©cursive dans les champs de modÃ¨le: \"%1$s\" ne peut pas dÃ©pendre de \"%2$s\" vu que  \"%2$s\" dÃ©pend dÃ©jÃ  \"%1$s\""
 
-#: include/class_plugin.inc:1316
+#: include/class_plugin.inc:1319
 #, php-format
 msgid "Tab \"%s\""
 msgstr "Onglet \"%s\""
@@ -3528,39 +3527,39 @@ msgstr "Aucun"
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: include/simpleplugin/class_helpersAttribute.inc:260
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "B"
 msgstr "O"
 
-#: include/simpleplugin/class_helpersAttribute.inc:261
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "KiB"
 msgstr "KiO"
 
-#: include/simpleplugin/class_helpersAttribute.inc:262
+#: include/simpleplugin/class_helpersAttribute.inc:266
 msgid "MiB"
 msgstr "MiO"
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_helpersAttribute.inc:267
 msgid "GiB"
 msgstr "GiO"
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "TiB"
 msgstr "TiO"
 
-#: include/simpleplugin/class_helpersAttribute.inc:275
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr "secondes"
 
-#: include/simpleplugin/class_helpersAttribute.inc:276
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr "minutes"
 
-#: include/simpleplugin/class_helpersAttribute.inc:277
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr "heures"
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr "jours"
 
@@ -3743,127 +3742,132 @@ msgstr "Option %s invalideâ€¯!"
 msgid "Specified objectType is empty or invalid!"
 msgstr "Le type d'objet spÃ©cifiÃ© est vide ou invalide !"
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
-msgstr "La session n'est pas chiffrÃ©eâ€¯!"
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
+msgstr "Attention: <a href=%s\"> La session n'est pas chiffrÃ©eâ€¯!<a>"
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
-msgstr "La durÃ©e de validitÃ© des sessions configurÃ©e dans votre fusiondirectory.conf sera remplacÃ©e par celle dÃ©finie dans votre php.ini."
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
+msgstr "Attention: La durÃ©e de validitÃ© des sessions configurÃ©e dans votre fusiondirectory.conf sera remplacÃ©e par celle dÃ©finie dans votre php.ini."
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr "Le fichier de configuration de FusionDirectory %s/%s ne peut Ãªtre lu. Veuillez exÃ©cuter fusiondirectory-setup --check-config."
 
-#: html/index.php:172
+#: html/index.php:171
 msgid "Smarty error"
 msgstr "Erreur Smarty"
 
-#: html/index.php:174
+#: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr "Le rÃ©pertoire \"%s\" spÃ©cifiÃ© comme rÃ©pertoire de compilation est inaccessibleâ€¯!"
 
-#: html/index.php:209
+#: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
 msgstr "Votre session FusionDirectory a expirÃ©â€¯!"
 
-#: html/index.php:212
+#: html/index.php:211
 msgid "Your IP has changed!"
 msgstr "Votre IP a changÃ©â€¯!"
 
-#: html/index.php:215
+#: html/index.php:214
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr "ParamÃ¨tre de plugin Â«%sÂ» invalideâ€¯!"
 
-#: html/index.php:218
+#: html/index.php:217
 msgid "No session found!"
 msgstr "Aucune session trouvÃ©eâ€¯!"
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr "La vÃ©rification des schÃ©mas LDAP a signalÃ© des erreursâ€¯:"
 
-#: html/index.php:279
+#: html/index.php:278
 msgid "Please specify a valid username!"
 msgstr "Veuillez indiquer un nom dâ€™utilisateur valideâ€¯!"
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify your password!"
 msgstr "Veuillez introduire votre mot de passeâ€¯!"
 
-#: html/index.php:301
+#: html/index.php:300
 msgid "Please check the username/password combination."
 msgstr "Veuillez vÃ©rifier le nom d'utilisateur et le mot de passe."
 
-#: html/index.php:331
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Compte verrouillÃ©. Veuillez contacter votre administrateur systÃ¨meâ€¯!"
 
-#: html/index.php:473
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr "L'utilisateur CAS \"%s\" n'existe pas dans l'annuaire LDAP "
 
-#: html/index.php:483
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr "L'utilisateur CAS \"%s\" correspond Ã  plusieurs personnes  dans l'annuaire LDAP "
 
-#: html/index.php:520
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr "Votre navigateur a les cookies dÃ©sactivÃ©s. Veuillez activer les cookies et recharger cette page avant de vous connecter !"
 
-#: html/main.php:113
+#: html/main.php:115
 msgid "PHP configuration"
 msgstr "Configuration de PHP"
 
-#: html/main.php:114
+#: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr "Erreur fataleâ€¯: Â«Register globalsÂ» est activÃ©. FusionDirectory ne permettra pas aux utilisateurs de se connecter tant que ceci n'est pas corrigÃ© par un administrateur."
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Password change"
 msgstr "Changement de mot de passe"
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
 msgstr "Votre mot de passe va bientÃ´t expirer, veuillez changer votre mot de passeâ€¯!"
 
-#: html/main.php:205
+#: html/main.php:158
+msgid "Your password has expired, please set a new one."
+msgstr "Votre mot de passe a expirÃ©, veuillez changer votre mot de passe."
+
+#: html/main.php:208
 msgid "Running out of memory!"
 msgstr "Plus de mÃ©moire disponibleâ€¯!"
 
-#: html/main.php:248
+#: html/main.php:251
 msgid "User ACL checks disabled"
 msgstr "Les vÃ©rifications des ACL de l'utilisateur ont Ã©tÃ© dÃ©sactivÃ©s"
 
-#: html/main.php:286
+#: html/main.php:289
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/main.php:287
+#: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
 msgstr "Erreur Fataleâ€¯: Impossible de trouver une dÃ©finition pour le plugin '%s' ! ('%s' n'est pas un fichier)â€¯!"
 
-#: html/main.php:302
+#: html/main.php:305
 msgid "Configuration Error"
 msgstr "Erreur de configuration"
 
-#: html/main.php:303
+#: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
@@ -3880,52 +3884,44 @@ msgstr "Le fichier de configuration de FusionDirectory %s/%s ne peut Ãªtre lu. A
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "Le rÃ©pertoire '%s' spÃ©cifiÃ© comme rÃ©pertoire de compilation est inaccessible !"
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr "La session ne sera pas chiffrÃ©e."
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr "DÃ©marrer une session SSL"
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr "Aucun compte utilisateur trouvÃ© avec l'identifiant \"%s\""
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr "Plusieurs comptes trouvÃ©s avec lâ€™identifiant \"%s\""
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:68
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr "Adresse de courriel"
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr "Il n'y a pas de compte qui utilise le courriel \"%s\""
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr "Il y a plusieurs comptes qui utilise le courriel \"%s\""
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr "L'utilisateur correspondant a l'adresse \"%s\" est verrouillÃ©. Veuillez contacter votre administrateur systÃ¨meâ€¯!"
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr "Contactez votre administrateur systÃ¨me, il y a eu un problÃ¨me avec le serveur de courriel"
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr "Le jeton n'est pas valide"
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr "Un problÃ¨me est survenu avec le serveur, le courriel de confirmation n'a pas Ã©tÃ© envoyÃ©"
 
@@ -4526,15 +4522,15 @@ msgid ""
 "'Off'."
 msgstr "Recherchez l'option 'zend.ze1_compatibility_mode' dans votre php.ini et mettez la Ã  'Off'."
 
-#: setup/class_setup.inc:127
+#: setup/class_setup.inc:122
 msgid "Setup error"
 msgstr "Erreur d'installation"
 
-#: setup/class_setup.inc:207
+#: setup/class_setup.inc:202
 msgid "Completed"
 msgstr "TerminÃ©"
 
-#: setup/class_setup.inc:250
+#: setup/class_setup.inc:245
 msgid "Next"
 msgstr "Suivant"
 
@@ -4783,72 +4779,78 @@ msgstr "ignorer cette erreur et montrer toutes les entrÃ©es dans la limite de ta
 msgid "Set"
 msgstr "Valider"
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
-msgstr "RÃ©cupÃ©ration de mot de passe de FusionDirectory"
-
-#: ihtml/themes/default/recovery.tpl.c:11
+#: ihtml/themes/default/recovery.tpl.c:8
 msgid "Lost password"
 msgstr "Mot de passe perdu"
 
+#: ihtml/themes/default/recovery.tpl.c:11
+msgid ""
+"Informations to reset password for %1 have been sent to email address %2"
+msgstr "Informations pour rÃ©initialiser le mot de passe pour %1 ont Ã©tÃ© envoyÃ©s Ã  l'adresse email %2"
+
 #: ihtml/themes/default/recovery.tpl.c:14
+msgid "Warning : this email is only valid for %1 minutes."
+msgstr "Attention: cet e-mail est uniquement valable pour %1 minutes."
+
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr "Cette fenÃªtre vous permet de changer votre mot de passe de maniÃ¨re simple. Entrez le mot de passe actuel et le nouveau mot de passe (deux fois) dans les champs ci-dessous et appuyez sur le bouton 'Changer'."
 
-#: ihtml/themes/default/recovery.tpl.c:17
 #: ihtml/themes/default/recovery.tpl.c:20
-#: ihtml/themes/default/recovery.tpl.c:62
-#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr "RÃ©pertoire"
 
-#: ihtml/themes/default/recovery.tpl.c:32
 #: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "Confirmation du nouveau mot de passe"
 
-#: ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr "SÃ©curitÃ© du mot de passe"
 
-#: ihtml/themes/default/recovery.tpl.c:41
-#: ihtml/themes/default/recovery.tpl.c:74
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr "Changer"
 
-#: ihtml/themes/default/recovery.tpl.c:44
-#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr "Cliquez ici pour changer votre mot de passe"
 
-#: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/recovery.tpl.c:53
 msgid "Success"
 msgstr "SuccÃ¨s"
 
-#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr "Votre mot de passe a Ã©tÃ© changÃ© avec succÃ¨s."
 
-#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr "Entrez votre adresse de courriel actuelle dans le champ si dessous et appuyer sur le bouton 'Changer'."
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
-msgstr "Indiquez votre adresse complÃ¨te, ex: jules.martin@exemple.fr"
+"=> Use your e-mail in the long format, e.g : John Doe => "
+"john.doe@example.com"
+msgstr "=> Indiquez votre adresse complÃ¨te, ex: Jules Martin => jules.martin@exemple.fr"
 
-#: ihtml/themes/default/recovery.tpl.c:71
-msgid "Mail"
-msgstr "Courriel"
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
+msgstr "Adresse de messagerie"
 
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
diff --git a/locale/hu_HU/fusiondirectory.po b/locale/hu_HU/fusiondirectory.po
index 775250eee16c9c8f73f6918410966a8655745e30..a5c3dcd04b8d8ba955097dbd579f87a7c4ae5eed 100644
--- a/locale/hu_HU/fusiondirectory.po
+++ b/locale/hu_HU/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-10 13:25+0200\n"
-"PO-Revision-Date: 2016-06-03 11:03+0000\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
+"PO-Revision-Date: 2016-06-25 10:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -145,7 +145,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_group.inc:73
 #: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:414
 msgid "GID"
 msgstr ""
 
@@ -202,11 +202,10 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467 include/functions.inc:799
+#: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:520 html/class_passwordRecovery.inc:169
-#: setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -218,7 +217,7 @@ msgid "Warning"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
@@ -563,7 +562,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr ""
 
@@ -934,7 +933,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1152,8 +1151,8 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:654
-#: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:32
 msgid "New password"
 msgstr ""
 
@@ -1338,11 +1337,11 @@ msgstr ""
 msgid "password not changeable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:408
+#: plugins/personal/posix/class_posixAccount.inc:411
 msgid "UID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:530
 #, php-format
 msgid "Group of user %s"
 msgstr ""
@@ -1584,7 +1583,7 @@ msgid "Session lifetime"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:207
-msgid "Defines when a session will expire in seconds."
+msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:212
@@ -2165,7 +2164,7 @@ msgstr ""
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:790
-#: include/class_plugin.inc:1518 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1521 include/class_CopyPasteHandler.inc:276
 #: include/simpleplugin/class_attribute.inc:1571
 #: include/simpleplugin/class_attribute.inc:1574
 #: include/simpleplugin/class_attribute.inc:1577
@@ -2178,7 +2177,7 @@ msgstr ""
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:471 html/index.php:481
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2302,7 +2301,7 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr ""
 
@@ -2324,7 +2323,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:367 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3416,7 +3415,7 @@ msgid ""
 "\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
 msgstr ""
 
-#: include/class_plugin.inc:1316
+#: include/class_plugin.inc:1319
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3526,39 +3525,39 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:260
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:261
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:262
+#: include/simpleplugin/class_helpersAttribute.inc:266
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_helpersAttribute.inc:267
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:275
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:276
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:277
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
@@ -3741,127 +3740,132 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:172
+#: html/index.php:171
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:174
+#: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:209
+#: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:212
+#: html/index.php:211
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:214
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:218
+#: html/index.php:217
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:279
+#: html/index.php:278
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:301
+#: html/index.php:300
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:331
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:473
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:483
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:520
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr ""
 
-#: html/main.php:113
+#: html/main.php:115
 msgid "PHP configuration"
 msgstr ""
 
-#: html/main.php:114
+#: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Password change"
 msgstr ""
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:205
+#: html/main.php:158
+msgid "Your password has expired, please set a new one."
+msgstr ""
+
+#: html/main.php:208
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:248
+#: html/main.php:251
 msgid "User ACL checks disabled"
 msgstr ""
 
-#: html/main.php:286
+#: html/main.php:289
 msgid "Plugin"
 msgstr ""
 
-#: html/main.php:287
+#: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
 msgstr ""
 
-#: html/main.php:302
+#: html/main.php:305
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:303
+#: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
@@ -3878,52 +3882,44 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr ""
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr ""
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:68
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4524,15 +4520,15 @@ msgid ""
 "'Off'."
 msgstr ""
 
-#: setup/class_setup.inc:127
+#: setup/class_setup.inc:122
 msgid "Setup error"
 msgstr ""
 
-#: setup/class_setup.inc:207
+#: setup/class_setup.inc:202
 msgid "Completed"
 msgstr ""
 
-#: setup/class_setup.inc:250
+#: setup/class_setup.inc:245
 msgid "Next"
 msgstr ""
 
@@ -4781,72 +4777,78 @@ msgstr ""
 msgid "Set"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
+#: ihtml/themes/default/recovery.tpl.c:8
+msgid "Lost password"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:11
-msgid "Lost password"
+msgid ""
+"Informations to reset password for %1 have been sent to email address %2"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:14
+msgid "Warning : this email is only valid for %1 minutes."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:17
 #: ihtml/themes/default/recovery.tpl.c:20
-#: ihtml/themes/default/recovery.tpl.c:62
-#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:32
 #: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:41
-#: ihtml/themes/default/recovery.tpl.c:74
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:44
-#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/recovery.tpl.c:53
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
+"=> Use your e-mail in the long format, e.g : John Doe => "
+"john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:71
-msgid "Mail"
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
diff --git a/locale/id/fusiondirectory.po b/locale/id/fusiondirectory.po
index 0e17437c4994d046cfebd056766021159a6b827c..54f0100ea1b08a215e86a641abdb0797903bc6b0 100644
--- a/locale/id/fusiondirectory.po
+++ b/locale/id/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-10 13:25+0200\n"
-"PO-Revision-Date: 2016-06-03 11:03+0000\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
+"PO-Revision-Date: 2016-06-25 10:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -144,7 +144,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_group.inc:73
 #: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:414
 msgid "GID"
 msgstr ""
 
@@ -201,11 +201,10 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467 include/functions.inc:799
+#: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:520 html/class_passwordRecovery.inc:169
-#: setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -217,7 +216,7 @@ msgid "Warning"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
@@ -562,7 +561,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr ""
 
@@ -933,7 +932,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1151,8 +1150,8 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:654
-#: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:32
 msgid "New password"
 msgstr ""
 
@@ -1337,11 +1336,11 @@ msgstr ""
 msgid "password not changeable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:408
+#: plugins/personal/posix/class_posixAccount.inc:411
 msgid "UID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:530
 #, php-format
 msgid "Group of user %s"
 msgstr ""
@@ -1583,7 +1582,7 @@ msgid "Session lifetime"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:207
-msgid "Defines when a session will expire in seconds."
+msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:212
@@ -2164,7 +2163,7 @@ msgstr ""
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:790
-#: include/class_plugin.inc:1518 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1521 include/class_CopyPasteHandler.inc:276
 #: include/simpleplugin/class_attribute.inc:1571
 #: include/simpleplugin/class_attribute.inc:1574
 #: include/simpleplugin/class_attribute.inc:1577
@@ -2177,7 +2176,7 @@ msgstr ""
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:471 html/index.php:481
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2301,7 +2300,7 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr ""
 
@@ -2323,7 +2322,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:367 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3415,7 +3414,7 @@ msgid ""
 "\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
 msgstr ""
 
-#: include/class_plugin.inc:1316
+#: include/class_plugin.inc:1319
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3525,39 +3524,39 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:260
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:261
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:262
+#: include/simpleplugin/class_helpersAttribute.inc:266
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_helpersAttribute.inc:267
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:275
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:276
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:277
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
@@ -3740,127 +3739,132 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:172
+#: html/index.php:171
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:174
+#: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:209
+#: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:212
+#: html/index.php:211
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:214
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:218
+#: html/index.php:217
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:279
+#: html/index.php:278
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:301
+#: html/index.php:300
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:331
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:473
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:483
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:520
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr ""
 
-#: html/main.php:113
+#: html/main.php:115
 msgid "PHP configuration"
 msgstr ""
 
-#: html/main.php:114
+#: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Password change"
 msgstr ""
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:205
+#: html/main.php:158
+msgid "Your password has expired, please set a new one."
+msgstr ""
+
+#: html/main.php:208
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:248
+#: html/main.php:251
 msgid "User ACL checks disabled"
 msgstr ""
 
-#: html/main.php:286
+#: html/main.php:289
 msgid "Plugin"
 msgstr ""
 
-#: html/main.php:287
+#: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
 msgstr ""
 
-#: html/main.php:302
+#: html/main.php:305
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:303
+#: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
@@ -3877,52 +3881,44 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr ""
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr ""
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:68
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4523,15 +4519,15 @@ msgid ""
 "'Off'."
 msgstr ""
 
-#: setup/class_setup.inc:127
+#: setup/class_setup.inc:122
 msgid "Setup error"
 msgstr ""
 
-#: setup/class_setup.inc:207
+#: setup/class_setup.inc:202
 msgid "Completed"
 msgstr ""
 
-#: setup/class_setup.inc:250
+#: setup/class_setup.inc:245
 msgid "Next"
 msgstr ""
 
@@ -4773,72 +4769,78 @@ msgstr ""
 msgid "Set"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
+#: ihtml/themes/default/recovery.tpl.c:8
+msgid "Lost password"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:11
-msgid "Lost password"
+msgid ""
+"Informations to reset password for %1 have been sent to email address %2"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:14
+msgid "Warning : this email is only valid for %1 minutes."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:17
 #: ihtml/themes/default/recovery.tpl.c:20
-#: ihtml/themes/default/recovery.tpl.c:62
-#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:32
 #: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:41
-#: ihtml/themes/default/recovery.tpl.c:74
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:44
-#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/recovery.tpl.c:53
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
+"=> Use your e-mail in the long format, e.g : John Doe => "
+"john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:71
-msgid "Mail"
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
diff --git a/locale/it_IT/fusiondirectory.po b/locale/it_IT/fusiondirectory.po
index ef25bc51098ed9551440f14eb61728bb7954f3e5..e368628c5f77add92928b73f8e1143ecdbcbc33e 100644
--- a/locale/it_IT/fusiondirectory.po
+++ b/locale/it_IT/fusiondirectory.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-10 13:25+0200\n"
-"PO-Revision-Date: 2016-06-08 01:44+0000\n"
-"Last-Translator: Paola Penati <penati@avaya.com>\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
+"PO-Revision-Date: 2016-06-25 10:50+0000\n"
+"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -147,7 +147,7 @@ msgstr "Forzare il valore GID per questo gruppo"
 
 #: plugins/admin/groups/class_group.inc:73
 #: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:414
 msgid "GID"
 msgstr "GID"
 
@@ -204,11 +204,10 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr "Consenti all'utente di connettersi solo a questo elenco di host "
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467 include/functions.inc:799
+#: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:520 html/class_passwordRecovery.inc:169
-#: setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -220,7 +219,7 @@ msgid "Warning"
 msgstr "Avvertimento"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr "Il tempo d'attesa per il blocco Ã¨ scaduto. Blocco ignorato !"
 
@@ -565,7 +564,7 @@ msgstr "Nome"
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr "Nome utente"
 
@@ -936,7 +935,7 @@ msgstr "Algoritmo da usare per la password"
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1154,8 +1153,8 @@ msgid ""
 msgstr "Le password che hai inserito come \" Nuova password \" e \"Ripeti nuova password\" non corrispondono."
 
 #: plugins/personal/generic/class_user.inc:654
-#: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:32
 msgid "New password"
 msgstr "Imposta la nuova password"
 
@@ -1340,11 +1339,11 @@ msgstr "Password scaduta"
 msgid "password not changeable"
 msgstr "Password non modificabile"
 
-#: plugins/personal/posix/class_posixAccount.inc:408
+#: plugins/personal/posix/class_posixAccount.inc:411
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:530
 #, php-format
 msgid "Group of user %s"
 msgstr "Gruppo di utenti %s"
@@ -1586,8 +1585,8 @@ msgid "Session lifetime"
 msgstr "Durata di vita della sessione"
 
 #: plugins/config/class_configInLdap.inc:207
-msgid "Defines when a session will expire in seconds."
-msgstr "Definisce, in secondi, quando una sessione scade"
+msgid "Defines when a session will expire in seconds (0 to disable)."
+msgstr "Definisce, in secondi, quando una sessione scade (0 per disabilitare)"
 
 #: plugins/config/class_configInLdap.inc:212
 msgid "HTTP authentication"
@@ -2167,7 +2166,7 @@ msgstr "Seleziona tutto"
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:790
-#: include/class_plugin.inc:1518 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1521 include/class_CopyPasteHandler.inc:276
 #: include/simpleplugin/class_attribute.inc:1571
 #: include/simpleplugin/class_attribute.inc:1574
 #: include/simpleplugin/class_attribute.inc:1577
@@ -2180,7 +2179,7 @@ msgstr "Seleziona tutto"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:471 html/index.php:481
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2304,7 +2303,7 @@ msgstr "Errore XML nel file fusiondirectory.conf: %s alla linea %d"
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr "Errore di configurazione"
 
@@ -2326,7 +2325,7 @@ msgstr "Sembra che si stia tentando di decodificare qualcosa che non Ã¨ codifica
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:367 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3418,7 +3417,7 @@ msgid ""
 "\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
 msgstr "La dipendenza riccorsiva nei campi di modello: \"%1$s\" non puo' dipendere da \"%2$s\" dato che \"%2$s\" dipende giÃ  da \"%1$s\""
 
-#: include/class_plugin.inc:1316
+#: include/class_plugin.inc:1319
 #, php-format
 msgid "Tab \"%s\""
 msgstr "Tab \"%s\""
@@ -3528,39 +3527,39 @@ msgstr "Nessuno"
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: include/simpleplugin/class_helpersAttribute.inc:260
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:261
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "KiB"
 msgstr "KiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:262
+#: include/simpleplugin/class_helpersAttribute.inc:266
 msgid "MiB"
 msgstr "MiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_helpersAttribute.inc:267
 msgid "GiB"
 msgstr "GiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "TiB"
 msgstr "TiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:275
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr "secondi"
 
-#: include/simpleplugin/class_helpersAttribute.inc:276
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr "minuti"
 
-#: include/simpleplugin/class_helpersAttribute.inc:277
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr "ore"
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr "giorni"
 
@@ -3743,127 +3742,132 @@ msgstr "Opzione '%s' non valida!"
 msgid "Specified objectType is empty or invalid!"
 msgstr "Il tipo d'oggetto specificato Ã¨ vuoto oppure non Ã¨ valido !"
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
-msgstr "La sessione non Ã¨ criptata."
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
+msgstr ""
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
-msgstr "La durata di vita delle sessioni configurata nel tuo file fusiondirectory.conf sarÃ  rimpiazzata da quella definita nel tuo php.ini."
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
+msgstr ""
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr "La configurazione %s/%s di FusionDirectory non Ã¨ leggibile. Esegui fusiondirectory-setup --check-config per risolvere questo problema."
 
-#: html/index.php:172
+#: html/index.php:171
 msgid "Smarty error"
 msgstr "Errore Smarty"
 
-#: html/index.php:174
+#: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr "Il directory \"%s\" specificato come directory di compilazione non Ã© accessibile!"
 
-#: html/index.php:209
+#: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
 msgstr "La tua sessione in FusionDirectory Ã¨ scaduta!"
 
-#: html/index.php:212
+#: html/index.php:211
 msgid "Your IP has changed!"
 msgstr "Il tuo IP Ã¨ stato cambiato!"
 
-#: html/index.php:215
+#: html/index.php:214
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr "Parametro \"%s\" di plugin invalido"
 
-#: html/index.php:218
+#: html/index.php:217
 msgid "No session found!"
 msgstr "Nessuna sessione trovata!"
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr "Lo schema LDAP verifica gli errori riportati:"
 
-#: html/index.php:279
+#: html/index.php:278
 msgid "Please specify a valid username!"
 msgstr "Prego specifica un nome utente valido !"
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify your password!"
 msgstr "Prego specifica la tua password !"
 
-#: html/index.php:301
+#: html/index.php:300
 msgid "Please check the username/password combination."
 msgstr "Verifica il nome utente e la password."
 
-#: html/index.php:331
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Conto bloccato. Contatta l'amministratore del sistema!"
 
-#: html/index.php:473
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr "Impossibile trovare l'utente \"%s\" CAS nell'annuario LDAP"
 
-#: html/index.php:483
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr "L'utente CAS \"%s\" corrisponde a piÃ¹ utenti nell'annuario LDAP"
 
-#: html/index.php:520
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr "Il tuo navigatore web ha i cookies disattivati. Attiva i cookies e ricarica la pagina prima di connetterti !"
 
-#: html/main.php:113
+#: html/main.php:115
 msgid "PHP configuration"
 msgstr "Configurazione PHP"
 
-#: html/main.php:114
+#: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr "Errore fatale: Register globals Ã¨ attivato. FusionDirectory rifiuterÃ  ogni accesso utente finchÃ¨ questo errore non sarÃ  corretto da un amministratore."
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Password change"
 msgstr "Modifica della password"
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
 msgstr "La tua password sta per scadere, per favore cambiala !"
 
-#: html/main.php:205
+#: html/main.php:158
+msgid "Your password has expired, please set a new one."
+msgstr ""
+
+#: html/main.php:208
 msgid "Running out of memory!"
 msgstr "Fine della memoria disponibile !"
 
-#: html/main.php:248
+#: html/main.php:251
 msgid "User ACL checks disabled"
 msgstr "Le verifiche ACL dell'utente sono state disattivate"
 
-#: html/main.php:286
+#: html/main.php:289
 msgid "Plugin"
 msgstr "Estensione"
 
-#: html/main.php:287
+#: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
 msgstr "Errore fatale: Impossibile trovare alcuna definizione per il plugin '%s' ('%s' non Ã¨ un file)!"
 
-#: html/main.php:302
+#: html/main.php:305
 msgid "Configuration Error"
 msgstr "Errore di configurazione"
 
-#: html/main.php:303
+#: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
@@ -3880,52 +3884,44 @@ msgstr "Il file di configurazione %s/%s non Ã¨ leggibile. Operazione Annullata."
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "La cartella '%s' dichiarata come cartella di compilazione Ã¨ inaccessibile !"
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr "La sessione non sarÃ  criptata."
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr "Inizia una sessione SSL"
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr "Alcun account trovato con login \"%s\" "
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr "Trovati piÃ¹ accounts con login \"%s\""
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:68
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr "Indirizzo di posta elettronica"
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr "Non c'Ã¨ nessun account che usa l'indirizzo mail %s"
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr "Ci sono piÃ¹ account che usano l'indirizzo mail %s"
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr "L'utente che usa la mail \"%s\" Ã© bloccato. Si prega di contattare l'amministratore di sistema."
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr "Contattare l'amministratore, c'Ã¨ stato un problema con il server di posta elettronica"
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr "Questo token non Ã¨ valido"
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr "Si Ã¨ verificato un problema con il server mail, la email di conferma non Ã¨ stata inviata"
 
@@ -4526,15 +4522,15 @@ msgid ""
 "'Off'."
 msgstr "Cerca la variabile 'zend.ze1_compatibility_mode' nel file php.ini e impostala su 'Off'."
 
-#: setup/class_setup.inc:127
+#: setup/class_setup.inc:122
 msgid "Setup error"
 msgstr "Errore di configurazione"
 
-#: setup/class_setup.inc:207
+#: setup/class_setup.inc:202
 msgid "Completed"
 msgstr "Completato"
 
-#: setup/class_setup.inc:250
+#: setup/class_setup.inc:245
 msgid "Next"
 msgstr "Successivo"
 
@@ -4783,72 +4779,78 @@ msgstr "ignora questo errore e mostra tutte le voci che rientrano nel sizelimit
 msgid "Set"
 msgstr "Attiva"
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
-msgstr "FusionDirectory recupero della password"
-
-#: ihtml/themes/default/recovery.tpl.c:11
+#: ihtml/themes/default/recovery.tpl.c:8
 msgid "Lost password"
 msgstr "Password dimenticata"
 
+#: ihtml/themes/default/recovery.tpl.c:11
+msgid ""
+"Informations to reset password for %1 have been sent to email address %2"
+msgstr "Le informazioni per resettare la password di %1 sono stati inviati all'indirizzo di posta elettronica %2"
+
 #: ihtml/themes/default/recovery.tpl.c:14
+msgid "Warning : this email is only valid for %1 minutes."
+msgstr "Attenzione: questa e-mail Ã© valida soltanto per %1 minuti."
+
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr "Questa finestra di dialogo fornisce un modo semplice per cambiare la tua password. Immetti la nuova password (due volte) nei campi sottostanti e premi il pulsante 'Modifica'."
 
-#: ihtml/themes/default/recovery.tpl.c:17
 #: ihtml/themes/default/recovery.tpl.c:20
-#: ihtml/themes/default/recovery.tpl.c:62
-#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr "Cartella"
 
-#: ihtml/themes/default/recovery.tpl.c:32
 #: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "Ripeti la nuova password"
 
-#: ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr "Livello di sicurezza della password"
 
-#: ihtml/themes/default/recovery.tpl.c:41
-#: ihtml/themes/default/recovery.tpl.c:74
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr "Modifica"
 
-#: ihtml/themes/default/recovery.tpl.c:44
-#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr "Premi qui per cambiare la tua password."
 
-#: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/recovery.tpl.c:53
 msgid "Success"
 msgstr "Completato"
 
-#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr "La tua password Ã¨ stata modificata."
 
-#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr "Inserisci il tuo indirizzo mail nel campo sottostante e premi il pulsante 'Modifica'"
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
-msgstr "=> Usa la tua e-mail nel formato lungo, ex. : John Doe => john.doe@ibcp.fr"
+"=> Use your e-mail in the long format, e.g : John Doe => "
+"john.doe@example.com"
+msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:71
-msgid "Mail"
-msgstr "Mail"
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
+msgstr "Indirizzo di posta elettronica"
 
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
diff --git a/locale/lv/fusiondirectory.po b/locale/lv/fusiondirectory.po
index 09845ebadc2d2823279490a4ce84ea6dfca741d8..f685776841a21c5d572da6798850b9211d4c0001 100644
--- a/locale/lv/fusiondirectory.po
+++ b/locale/lv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-10 13:25+0200\n"
-"PO-Revision-Date: 2016-06-03 11:03+0000\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
+"PO-Revision-Date: 2016-06-25 10:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Latvian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -144,7 +144,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_group.inc:73
 #: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:414
 msgid "GID"
 msgstr ""
 
@@ -201,11 +201,10 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467 include/functions.inc:799
+#: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:520 html/class_passwordRecovery.inc:169
-#: setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -217,7 +216,7 @@ msgid "Warning"
 msgstr "BrÄ«dinÄjums"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
@@ -562,7 +561,7 @@ msgstr "VÄrds"
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr ""
 
@@ -933,7 +932,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1151,8 +1150,8 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:654
-#: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:32
 msgid "New password"
 msgstr ""
 
@@ -1337,11 +1336,11 @@ msgstr ""
 msgid "password not changeable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:408
+#: plugins/personal/posix/class_posixAccount.inc:411
 msgid "UID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:530
 #, php-format
 msgid "Group of user %s"
 msgstr ""
@@ -1583,7 +1582,7 @@ msgid "Session lifetime"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:207
-msgid "Defines when a session will expire in seconds."
+msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:212
@@ -2164,7 +2163,7 @@ msgstr ""
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:790
-#: include/class_plugin.inc:1518 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1521 include/class_CopyPasteHandler.inc:276
 #: include/simpleplugin/class_attribute.inc:1571
 #: include/simpleplugin/class_attribute.inc:1574
 #: include/simpleplugin/class_attribute.inc:1577
@@ -2177,7 +2176,7 @@ msgstr ""
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:471 html/index.php:481
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2301,7 +2300,7 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr ""
 
@@ -2323,7 +2322,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:367 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3415,7 +3414,7 @@ msgid ""
 "\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
 msgstr ""
 
-#: include/class_plugin.inc:1316
+#: include/class_plugin.inc:1319
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3525,39 +3524,39 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:260
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:261
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:262
+#: include/simpleplugin/class_helpersAttribute.inc:266
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_helpersAttribute.inc:267
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:275
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:276
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:277
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
@@ -3740,127 +3739,132 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:172
+#: html/index.php:171
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:174
+#: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:209
+#: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:212
+#: html/index.php:211
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:214
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:218
+#: html/index.php:217
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:279
+#: html/index.php:278
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:301
+#: html/index.php:300
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:331
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:473
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:483
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:520
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr ""
 
-#: html/main.php:113
+#: html/main.php:115
 msgid "PHP configuration"
 msgstr ""
 
-#: html/main.php:114
+#: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Password change"
 msgstr ""
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:205
+#: html/main.php:158
+msgid "Your password has expired, please set a new one."
+msgstr ""
+
+#: html/main.php:208
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:248
+#: html/main.php:251
 msgid "User ACL checks disabled"
 msgstr ""
 
-#: html/main.php:286
+#: html/main.php:289
 msgid "Plugin"
 msgstr ""
 
-#: html/main.php:287
+#: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
 msgstr ""
 
-#: html/main.php:302
+#: html/main.php:305
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:303
+#: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
@@ -3877,52 +3881,44 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr ""
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr ""
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:68
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr "E-pasta adrese"
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4523,15 +4519,15 @@ msgid ""
 "'Off'."
 msgstr ""
 
-#: setup/class_setup.inc:127
+#: setup/class_setup.inc:122
 msgid "Setup error"
 msgstr ""
 
-#: setup/class_setup.inc:207
+#: setup/class_setup.inc:202
 msgid "Completed"
 msgstr ""
 
-#: setup/class_setup.inc:250
+#: setup/class_setup.inc:245
 msgid "Next"
 msgstr ""
 
@@ -4787,72 +4783,78 @@ msgstr ""
 msgid "Set"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
+#: ihtml/themes/default/recovery.tpl.c:8
+msgid "Lost password"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:11
-msgid "Lost password"
+msgid ""
+"Informations to reset password for %1 have been sent to email address %2"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:14
+msgid "Warning : this email is only valid for %1 minutes."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:17
 #: ihtml/themes/default/recovery.tpl.c:20
-#: ihtml/themes/default/recovery.tpl.c:62
-#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:32
 #: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:41
-#: ihtml/themes/default/recovery.tpl.c:74
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:44
-#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/recovery.tpl.c:53
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
+"=> Use your e-mail in the long format, e.g : John Doe => "
+"john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:71
-msgid "Mail"
-msgstr "Pasts"
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
+msgstr "E-pasts"
 
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
diff --git a/locale/nb/fusiondirectory.po b/locale/nb/fusiondirectory.po
index 73ae9131510026c3b430b743572651acdfca4533..bdf4b3a4b6d0be445987252242c09f5e4eb2e233 100644
--- a/locale/nb/fusiondirectory.po
+++ b/locale/nb/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-10 13:25+0200\n"
-"PO-Revision-Date: 2016-06-03 11:03+0000\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
+"PO-Revision-Date: 2016-06-25 10:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -144,7 +144,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_group.inc:73
 #: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:414
 msgid "GID"
 msgstr ""
 
@@ -201,11 +201,10 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467 include/functions.inc:799
+#: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:520 html/class_passwordRecovery.inc:169
-#: setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -217,7 +216,7 @@ msgid "Warning"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
@@ -562,7 +561,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr ""
 
@@ -933,7 +932,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1151,8 +1150,8 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:654
-#: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:32
 msgid "New password"
 msgstr ""
 
@@ -1337,11 +1336,11 @@ msgstr ""
 msgid "password not changeable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:408
+#: plugins/personal/posix/class_posixAccount.inc:411
 msgid "UID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:530
 #, php-format
 msgid "Group of user %s"
 msgstr ""
@@ -1583,7 +1582,7 @@ msgid "Session lifetime"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:207
-msgid "Defines when a session will expire in seconds."
+msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:212
@@ -2164,7 +2163,7 @@ msgstr ""
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:790
-#: include/class_plugin.inc:1518 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1521 include/class_CopyPasteHandler.inc:276
 #: include/simpleplugin/class_attribute.inc:1571
 #: include/simpleplugin/class_attribute.inc:1574
 #: include/simpleplugin/class_attribute.inc:1577
@@ -2177,7 +2176,7 @@ msgstr ""
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:471 html/index.php:481
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2301,7 +2300,7 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr ""
 
@@ -2323,7 +2322,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:367 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3415,7 +3414,7 @@ msgid ""
 "\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
 msgstr ""
 
-#: include/class_plugin.inc:1316
+#: include/class_plugin.inc:1319
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3525,39 +3524,39 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:260
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:261
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:262
+#: include/simpleplugin/class_helpersAttribute.inc:266
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_helpersAttribute.inc:267
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:275
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:276
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:277
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
@@ -3740,127 +3739,132 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:172
+#: html/index.php:171
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:174
+#: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:209
+#: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:212
+#: html/index.php:211
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:214
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:218
+#: html/index.php:217
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:279
+#: html/index.php:278
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:301
+#: html/index.php:300
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:331
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:473
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:483
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:520
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr ""
 
-#: html/main.php:113
+#: html/main.php:115
 msgid "PHP configuration"
 msgstr ""
 
-#: html/main.php:114
+#: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Password change"
 msgstr ""
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:205
+#: html/main.php:158
+msgid "Your password has expired, please set a new one."
+msgstr ""
+
+#: html/main.php:208
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:248
+#: html/main.php:251
 msgid "User ACL checks disabled"
 msgstr ""
 
-#: html/main.php:286
+#: html/main.php:289
 msgid "Plugin"
 msgstr ""
 
-#: html/main.php:287
+#: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
 msgstr ""
 
-#: html/main.php:302
+#: html/main.php:305
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:303
+#: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
@@ -3877,52 +3881,44 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr ""
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr ""
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:68
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4523,15 +4519,15 @@ msgid ""
 "'Off'."
 msgstr ""
 
-#: setup/class_setup.inc:127
+#: setup/class_setup.inc:122
 msgid "Setup error"
 msgstr ""
 
-#: setup/class_setup.inc:207
+#: setup/class_setup.inc:202
 msgid "Completed"
 msgstr ""
 
-#: setup/class_setup.inc:250
+#: setup/class_setup.inc:245
 msgid "Next"
 msgstr ""
 
@@ -4780,72 +4776,78 @@ msgstr ""
 msgid "Set"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
+#: ihtml/themes/default/recovery.tpl.c:8
+msgid "Lost password"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:11
-msgid "Lost password"
+msgid ""
+"Informations to reset password for %1 have been sent to email address %2"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:14
+msgid "Warning : this email is only valid for %1 minutes."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:17
 #: ihtml/themes/default/recovery.tpl.c:20
-#: ihtml/themes/default/recovery.tpl.c:62
-#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:32
 #: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:41
-#: ihtml/themes/default/recovery.tpl.c:74
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:44
-#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/recovery.tpl.c:53
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
+"=> Use your e-mail in the long format, e.g : John Doe => "
+"john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:71
-msgid "Mail"
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
diff --git a/locale/nl/fusiondirectory.po b/locale/nl/fusiondirectory.po
index 99d8bf2a00e735c6c9ee6575d7cb13e2b5404823..838512107da65caa1dc8d5fcbb5337208ea7834f 100644
--- a/locale/nl/fusiondirectory.po
+++ b/locale/nl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-10 13:25+0200\n"
-"PO-Revision-Date: 2016-06-03 11:03+0000\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
+"PO-Revision-Date: 2016-06-25 10:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -144,7 +144,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_group.inc:73
 #: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:414
 msgid "GID"
 msgstr "GID"
 
@@ -201,11 +201,10 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467 include/functions.inc:799
+#: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:520 html/class_passwordRecovery.inc:169
-#: setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -217,7 +216,7 @@ msgid "Warning"
 msgstr "Waarschuwing"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr "Timeout tijdens het wachten voor een lock. lock is genegeerd!"
 
@@ -562,7 +561,7 @@ msgstr "Naam"
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr "Inlognaam"
 
@@ -933,7 +932,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1151,8 +1150,8 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:654
-#: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
@@ -1337,11 +1336,11 @@ msgstr "paswoord is vervallen"
 msgid "password not changeable"
 msgstr "paswoord niet wijzigbaar"
 
-#: plugins/personal/posix/class_posixAccount.inc:408
+#: plugins/personal/posix/class_posixAccount.inc:411
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:530
 #, php-format
 msgid "Group of user %s"
 msgstr ""
@@ -1583,7 +1582,7 @@ msgid "Session lifetime"
 msgstr "Sessie levensduur"
 
 #: plugins/config/class_configInLdap.inc:207
-msgid "Defines when a session will expire in seconds."
+msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:212
@@ -2164,7 +2163,7 @@ msgstr "Selecteer alles"
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:790
-#: include/class_plugin.inc:1518 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1521 include/class_CopyPasteHandler.inc:276
 #: include/simpleplugin/class_attribute.inc:1571
 #: include/simpleplugin/class_attribute.inc:1574
 #: include/simpleplugin/class_attribute.inc:1577
@@ -2177,7 +2176,7 @@ msgstr "Selecteer alles"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:471 html/index.php:481
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2301,7 +2300,7 @@ msgstr "XML fout in fusiondirectory.conf: %s op regel %d"
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr "Configuratie fout"
 
@@ -2323,7 +2322,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:367 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3415,7 +3414,7 @@ msgid ""
 "\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
 msgstr ""
 
-#: include/class_plugin.inc:1316
+#: include/class_plugin.inc:1319
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3525,39 +3524,39 @@ msgstr "Geen"
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: include/simpleplugin/class_helpersAttribute.inc:260
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:261
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:262
+#: include/simpleplugin/class_helpersAttribute.inc:266
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_helpersAttribute.inc:267
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:275
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr "seconden"
 
-#: include/simpleplugin/class_helpersAttribute.inc:276
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr "minuten"
 
-#: include/simpleplugin/class_helpersAttribute.inc:277
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr "uren"
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr "dagen"
 
@@ -3740,127 +3739,132 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr "Gespecifieerd objectType is leeg of ongeldig!"
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
-msgstr "Sessie is niet geÃ«ncrypteerd!"
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
+msgstr ""
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
-msgstr "De levensduur van de sessie geconfigureerd in fusiondirectory.conf zal overschreven worden door php.ini opties."
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
+msgstr ""
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:172
+#: html/index.php:171
 msgid "Smarty error"
 msgstr "Smarty error"
 
-#: html/index.php:174
+#: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:209
+#: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
 msgstr "Je FusionDirectory sessie is vervallen!"
 
-#: html/index.php:212
+#: html/index.php:211
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:214
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:218
+#: html/index.php:217
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:279
+#: html/index.php:278
 msgid "Please specify a valid username!"
 msgstr "Geef a.u.b. een geldige gebruikersnaam op!"
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify your password!"
 msgstr "Geef a.u.b. uw wachtwoord op!"
 
-#: html/index.php:301
+#: html/index.php:300
 msgid "Please check the username/password combination."
 msgstr "Controleer a.u.b. de gebruikersnaam/wachtwoord combinatie."
 
-#: html/index.php:331
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Accound geblokkeerd. Contacteer aub je systeembeheerder!"
 
-#: html/index.php:473
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:483
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:520
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr "Cookies zijn uitgeschakeld in uw browser. Schakel cookies a.u.b. in en herlaad deze pagina voordat u inlogt!"
 
-#: html/main.php:113
+#: html/main.php:115
 msgid "PHP configuration"
 msgstr "PHP configuratie"
 
-#: html/main.php:114
+#: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr "Fatale error : Registreer globals in aan. FusionDirectory zal login weigeren als dit niet opgelost wordt door een admin."
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Password change"
 msgstr "Paswoord wijzigen"
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
 msgstr "Je paswoord gaat vervallen, gelieve je paswoord te wijzigen!"
 
-#: html/main.php:205
+#: html/main.php:158
+msgid "Your password has expired, please set a new one."
+msgstr ""
+
+#: html/main.php:208
 msgid "Running out of memory!"
 msgstr "Bijna zonder geheugen!"
 
-#: html/main.php:248
+#: html/main.php:251
 msgid "User ACL checks disabled"
 msgstr "Gebruiker ACL verificatie is niet actief"
 
-#: html/main.php:286
+#: html/main.php:289
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/main.php:287
+#: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
 msgstr "Fatale error: Kan plugin definities niet vinden voor plugin '%s' ('%s' is geen bestand)!"
 
-#: html/main.php:302
+#: html/main.php:305
 msgid "Configuration Error"
 msgstr "Configuratie Error"
 
-#: html/main.php:303
+#: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
@@ -3877,52 +3881,44 @@ msgstr "FusionDirectory configuratie %s/%s is niet leesbaar. Geannuleerd."
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "Directory '%s' die opgegeven is als compileer directory is niet toegankelijk!"
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr "De sessie zal niet versleuteld zijn."
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr "Gebruik een SSL sessie"
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:68
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr "E-mail adres"
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr "Contacteer je systeembeheerder, er was een probleem met de mailserver"
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr "Deze token is niet geldig"
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr "Er was een probleem met de mail server, de bevestiging werd niet verstuurd"
 
@@ -4523,15 +4519,15 @@ msgid ""
 "'Off'."
 msgstr "Zoek naar 'zend.ze1_compatibility_mode' in je php.ini en plaats het naar 'Off'."
 
-#: setup/class_setup.inc:127
+#: setup/class_setup.inc:122
 msgid "Setup error"
 msgstr "Setup error"
 
-#: setup/class_setup.inc:207
+#: setup/class_setup.inc:202
 msgid "Completed"
 msgstr "Voltooid"
 
-#: setup/class_setup.inc:250
+#: setup/class_setup.inc:245
 msgid "Next"
 msgstr "Volgende"
 
@@ -4780,72 +4776,78 @@ msgstr "Negeer deze fout en toon alle gegevens die passen binnen de gedefiniÃ«er
 msgid "Set"
 msgstr "Stel in"
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
-msgstr "FusionDirectory paswoord herstel"
-
-#: ihtml/themes/default/recovery.tpl.c:11
+#: ihtml/themes/default/recovery.tpl.c:8
 msgid "Lost password"
 msgstr "Paswoord vergeten"
 
+#: ihtml/themes/default/recovery.tpl.c:11
+msgid ""
+"Informations to reset password for %1 have been sent to email address %2"
+msgstr ""
+
 #: ihtml/themes/default/recovery.tpl.c:14
+msgid "Warning : this email is only valid for %1 minutes."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr "Deze dialoog zorgt voor een simpele manier om je paswoord de wijzigen. Vul het nieuwe paswoord in (tweemaal) in onderstaande velden en klik op de 'Verander' knop."
 
-#: ihtml/themes/default/recovery.tpl.c:17
 #: ihtml/themes/default/recovery.tpl.c:20
-#: ihtml/themes/default/recovery.tpl.c:62
-#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr "Directory"
 
-#: ihtml/themes/default/recovery.tpl.c:32
 #: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "Nieuw wachtwoord opnieuw"
 
-#: ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr "Wachtwoord sterkte"
 
-#: ihtml/themes/default/recovery.tpl.c:41
-#: ihtml/themes/default/recovery.tpl.c:74
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr "Wijzig"
 
-#: ihtml/themes/default/recovery.tpl.c:44
-#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr "Klik hier om je paswoord te wijzigen"
 
-#: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/recovery.tpl.c:53
 msgid "Success"
 msgstr "Succes"
 
-#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr "Je paswoord is succesvol gewijzigd."
 
-#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr "Vul je huidige e-mail adres in in onderstaand veld en klik op de 'Verander' knop."
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
-msgstr "=> Gebruik je e-mail in het lange formaat, bv. John Doe => john.doe@ibcp.fr"
+"=> Use your e-mail in the long format, e.g : John Doe => "
+"john.doe@example.com"
+msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:71
-msgid "Mail"
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
 msgstr "E-mail"
 
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
diff --git a/locale/pl/fusiondirectory.po b/locale/pl/fusiondirectory.po
index 74215ffee0c6f26363e119ec079db26640a5f4e6..e07dcca3b5507be1ba6bddc5434e90252ab961d4 100644
--- a/locale/pl/fusiondirectory.po
+++ b/locale/pl/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-10 13:25+0200\n"
-"PO-Revision-Date: 2016-06-03 11:03+0000\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
+"PO-Revision-Date: 2016-06-25 10:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Polish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -144,7 +144,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_group.inc:73
 #: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:414
 msgid "GID"
 msgstr "GID"
 
@@ -201,11 +201,10 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467 include/functions.inc:799
+#: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:520 html/class_passwordRecovery.inc:169
-#: setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -217,7 +216,7 @@ msgid "Warning"
 msgstr "OstrzeÅ¼enie"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
@@ -562,7 +561,7 @@ msgstr "ImiÄ™"
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr "Login"
 
@@ -933,7 +932,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1151,8 +1150,8 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:654
-#: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nowe hasÅ‚o"
 
@@ -1337,11 +1336,11 @@ msgstr "hasÅ‚o wygasÅ‚o"
 msgid "password not changeable"
 msgstr "hasÅ‚o niezmienialne"
 
-#: plugins/personal/posix/class_posixAccount.inc:408
+#: plugins/personal/posix/class_posixAccount.inc:411
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:530
 #, php-format
 msgid "Group of user %s"
 msgstr ""
@@ -1583,7 +1582,7 @@ msgid "Session lifetime"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:207
-msgid "Defines when a session will expire in seconds."
+msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:212
@@ -2164,7 +2163,7 @@ msgstr "Wybierz wszystko"
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:790
-#: include/class_plugin.inc:1518 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1521 include/class_CopyPasteHandler.inc:276
 #: include/simpleplugin/class_attribute.inc:1571
 #: include/simpleplugin/class_attribute.inc:1574
 #: include/simpleplugin/class_attribute.inc:1577
@@ -2177,7 +2176,7 @@ msgstr "Wybierz wszystko"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:471 html/index.php:481
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2301,7 +2300,7 @@ msgstr "BÅ‚Ä…d XML w pliku fusiondirectory.conf: %s w linii %d"
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr "BÅ‚Ä…d konfiguracji"
 
@@ -2323,7 +2322,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:367 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3415,7 +3414,7 @@ msgid ""
 "\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
 msgstr ""
 
-#: include/class_plugin.inc:1316
+#: include/class_plugin.inc:1319
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3525,39 +3524,39 @@ msgstr ""
 msgid "Unknown"
 msgstr "Nieznane"
 
-#: include/simpleplugin/class_helpersAttribute.inc:260
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:261
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:262
+#: include/simpleplugin/class_helpersAttribute.inc:266
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_helpersAttribute.inc:267
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:275
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:276
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:277
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr "godzin"
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr "dni"
 
@@ -3740,127 +3739,132 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
-msgstr "Sesja nie jest szyfrowana!"
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
+msgstr ""
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:172
+#: html/index.php:171
 msgid "Smarty error"
 msgstr "BÅ‚Ä…d Smarty"
 
-#: html/index.php:174
+#: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:209
+#: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:212
+#: html/index.php:211
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:214
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:218
+#: html/index.php:217
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:279
+#: html/index.php:278
 msgid "Please specify a valid username!"
 msgstr "ProszÄ™ podaÄ‡ prawidÅ‚owÄ… nazwÄ™ uÅ¼ytkownika!"
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify your password!"
 msgstr "ProszÄ™ podaÄ‡ prawidÅ‚owe hasÅ‚o!"
 
-#: html/index.php:301
+#: html/index.php:300
 msgid "Please check the username/password combination."
 msgstr "ProszÄ™ sprawdziÄ‡ kombinacjÄ™ login/hasÅ‚o."
 
-#: html/index.php:331
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:473
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:483
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:520
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr "Twoja przeglÄ…darka ma wyÅ‚Ä…czone cookies. ProszÄ™ wÅ‚Ä…czyÄ‡ cookies i przeÅ‚adowaÄ‡ stronÄ™ przed logowaniem!"
 
-#: html/main.php:113
+#: html/main.php:115
 msgid "PHP configuration"
 msgstr "Konfiguracja PHP"
 
-#: html/main.php:114
+#: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Password change"
 msgstr "Zmiana hasÅ‚a"
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:205
+#: html/main.php:158
+msgid "Your password has expired, please set a new one."
+msgstr ""
+
+#: html/main.php:208
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:248
+#: html/main.php:251
 msgid "User ACL checks disabled"
 msgstr ""
 
-#: html/main.php:286
+#: html/main.php:289
 msgid "Plugin"
 msgstr "Dodatek"
 
-#: html/main.php:287
+#: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
 msgstr ""
 
-#: html/main.php:302
+#: html/main.php:305
 msgid "Configuration Error"
 msgstr "BÅ‚Ä…d konfiguracji"
 
-#: html/main.php:303
+#: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
@@ -3877,52 +3881,44 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "Katalog '%s' podany jako katalog kompilacji jest niedostÄ™pny!"
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr "Sesja nie bÄ™dzie szyfrowana."
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr "SprowadÅº sesjÄ™ SSL"
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:68
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr "Adres email"
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4523,15 +4519,15 @@ msgid ""
 "'Off'."
 msgstr ""
 
-#: setup/class_setup.inc:127
+#: setup/class_setup.inc:122
 msgid "Setup error"
 msgstr "BÅ‚Ä…d ustawieÅ„"
 
-#: setup/class_setup.inc:207
+#: setup/class_setup.inc:202
 msgid "Completed"
 msgstr ""
 
-#: setup/class_setup.inc:250
+#: setup/class_setup.inc:245
 msgid "Next"
 msgstr "NastÄ™pne"
 
@@ -4787,72 +4783,78 @@ msgstr "ignoruj ten bÅ‚Ä…d i pokaÅ¼ wszystkie elementy ktÃ³re zmieszczÄ… siÄ™ w
 msgid "Set"
 msgstr "Ustaw"
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
+#: ihtml/themes/default/recovery.tpl.c:8
+msgid "Lost password"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:11
-msgid "Lost password"
+msgid ""
+"Informations to reset password for %1 have been sent to email address %2"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:14
+msgid "Warning : this email is only valid for %1 minutes."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:17
 #: ihtml/themes/default/recovery.tpl.c:20
-#: ihtml/themes/default/recovery.tpl.c:62
-#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr "Katalog"
 
-#: ihtml/themes/default/recovery.tpl.c:32
 #: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:41
-#: ihtml/themes/default/recovery.tpl.c:74
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr "ZmieÅ„"
 
-#: ihtml/themes/default/recovery.tpl.c:44
-#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr "Kliknij tutaj aby zmieniÄ‡ swoje hasÅ‚o"
 
-#: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/recovery.tpl.c:53
 msgid "Success"
 msgstr "Powodzenie"
 
-#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr "Twoje hasÅ‚o zostaÅ‚o pomyÅ›lnie zmienione."
 
-#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
+"=> Use your e-mail in the long format, e.g : John Doe => "
+"john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:71
-msgid "Mail"
-msgstr "Poczta"
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
+msgstr "Email"
 
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
diff --git a/locale/pt/fusiondirectory.po b/locale/pt/fusiondirectory.po
index 6aed90a9a6feb71c7594e8bf2596873c3500ed09..c4319bcdb00b321c68ae9532cd3256527bdf3bdd 100644
--- a/locale/pt/fusiondirectory.po
+++ b/locale/pt/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-10 13:25+0200\n"
-"PO-Revision-Date: 2016-06-03 11:03+0000\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
+"PO-Revision-Date: 2016-06-25 10:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -144,7 +144,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_group.inc:73
 #: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:414
 msgid "GID"
 msgstr "GID"
 
@@ -201,11 +201,10 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467 include/functions.inc:799
+#: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:520 html/class_passwordRecovery.inc:169
-#: setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -217,7 +216,7 @@ msgid "Warning"
 msgstr "AtenÃ§Ã£o"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
@@ -562,7 +561,7 @@ msgstr "Nome fornecido"
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr "Login"
 
@@ -933,7 +932,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1151,8 +1150,8 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:654
-#: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nova senha"
 
@@ -1337,11 +1336,11 @@ msgstr ""
 msgid "password not changeable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:408
+#: plugins/personal/posix/class_posixAccount.inc:411
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:530
 #, php-format
 msgid "Group of user %s"
 msgstr ""
@@ -1583,7 +1582,7 @@ msgid "Session lifetime"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:207
-msgid "Defines when a session will expire in seconds."
+msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:212
@@ -2164,7 +2163,7 @@ msgstr ""
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:790
-#: include/class_plugin.inc:1518 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1521 include/class_CopyPasteHandler.inc:276
 #: include/simpleplugin/class_attribute.inc:1571
 #: include/simpleplugin/class_attribute.inc:1574
 #: include/simpleplugin/class_attribute.inc:1577
@@ -2177,7 +2176,7 @@ msgstr ""
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:471 html/index.php:481
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2301,7 +2300,7 @@ msgstr "Erro de XML no fusiondirectory.conf: %s na linha %d"
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr "Erro de configuraÃ§Ã£o"
 
@@ -2323,7 +2322,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:367 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3415,7 +3414,7 @@ msgid ""
 "\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
 msgstr ""
 
-#: include/class_plugin.inc:1316
+#: include/class_plugin.inc:1319
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3525,39 +3524,39 @@ msgstr ""
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: include/simpleplugin/class_helpersAttribute.inc:260
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:261
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:262
+#: include/simpleplugin/class_helpersAttribute.inc:266
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_helpersAttribute.inc:267
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:275
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:276
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:277
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
@@ -3740,127 +3739,132 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:172
+#: html/index.php:171
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:174
+#: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:209
+#: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:212
+#: html/index.php:211
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:214
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:218
+#: html/index.php:217
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:279
+#: html/index.php:278
 msgid "Please specify a valid username!"
 msgstr "Por favor, especifique um nome de usuÃ¡rio vÃ¡lido!"
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify your password!"
 msgstr "Por favor, especifique sua senha!"
 
-#: html/index.php:301
+#: html/index.php:300
 msgid "Please check the username/password combination."
 msgstr "Por favor, verifique a combinaÃ§Ã£o usuÃ¡rio / senha"
 
-#: html/index.php:331
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:473
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:483
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:520
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr "Seu navegador estÃ¡ com suporte a cookies desabilitado. Por favor, habilite-o e recarregue essa pÃ¡gina antes de entrar!"
 
-#: html/main.php:113
+#: html/main.php:115
 msgid "PHP configuration"
 msgstr ""
 
-#: html/main.php:114
+#: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Password change"
 msgstr "Senha alterada"
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:205
+#: html/main.php:158
+msgid "Your password has expired, please set a new one."
+msgstr ""
+
+#: html/main.php:208
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:248
+#: html/main.php:251
 msgid "User ACL checks disabled"
 msgstr ""
 
-#: html/main.php:286
+#: html/main.php:289
 msgid "Plugin"
 msgstr ""
 
-#: html/main.php:287
+#: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
 msgstr ""
 
-#: html/main.php:302
+#: html/main.php:305
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:303
+#: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
@@ -3877,52 +3881,44 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr "A sessÃ£o nÃ£o serÃ¡ criptografada."
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr "Entre com a sessÃ£o SSL"
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:68
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4523,15 +4519,15 @@ msgid ""
 "'Off'."
 msgstr ""
 
-#: setup/class_setup.inc:127
+#: setup/class_setup.inc:122
 msgid "Setup error"
 msgstr ""
 
-#: setup/class_setup.inc:207
+#: setup/class_setup.inc:202
 msgid "Completed"
 msgstr ""
 
-#: setup/class_setup.inc:250
+#: setup/class_setup.inc:245
 msgid "Next"
 msgstr ""
 
@@ -4780,72 +4776,78 @@ msgstr ""
 msgid "Set"
 msgstr "Definir"
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
+#: ihtml/themes/default/recovery.tpl.c:8
+msgid "Lost password"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:11
-msgid "Lost password"
+msgid ""
+"Informations to reset password for %1 have been sent to email address %2"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:14
+msgid "Warning : this email is only valid for %1 minutes."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:17
 #: ihtml/themes/default/recovery.tpl.c:20
-#: ihtml/themes/default/recovery.tpl.c:62
-#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr "DiretÃ³rio"
 
-#: ihtml/themes/default/recovery.tpl.c:32
 #: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "Nova senha repetida"
 
-#: ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:41
-#: ihtml/themes/default/recovery.tpl.c:74
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr "Alterar"
 
-#: ihtml/themes/default/recovery.tpl.c:44
-#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr "Clique aqui para alterar sua senha"
 
-#: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/recovery.tpl.c:53
 msgid "Success"
 msgstr "Sucesso"
 
-#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr "Sua senha foi alterada com sucesso."
 
-#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
+"=> Use your e-mail in the long format, e.g : John Doe => "
+"john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:71
-msgid "Mail"
-msgstr "Correio"
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
+msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
diff --git a/locale/pt_BR/fusiondirectory.po b/locale/pt_BR/fusiondirectory.po
index c5bb67d33365f7066f155e58ea552bdb7bb9a084..8af6e954c120db57f9b3f45a570facea57eb57ba 100644
--- a/locale/pt_BR/fusiondirectory.po
+++ b/locale/pt_BR/fusiondirectory.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-10 13:25+0200\n"
-"PO-Revision-Date: 2016-06-03 11:03+0000\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
+"PO-Revision-Date: 2016-06-25 10:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -145,7 +145,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_group.inc:73
 #: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:414
 msgid "GID"
 msgstr "GID"
 
@@ -202,11 +202,10 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467 include/functions.inc:799
+#: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:520 html/class_passwordRecovery.inc:169
-#: setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -218,7 +217,7 @@ msgid "Warning"
 msgstr "Aviso"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
@@ -563,7 +562,7 @@ msgstr "Primeiro nome"
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr "Login"
 
@@ -934,7 +933,7 @@ msgstr "MÃ©todo de hash para usar na senha"
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1152,8 +1151,8 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:654
-#: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nova senha"
 
@@ -1338,11 +1337,11 @@ msgstr "senha expirada"
 msgid "password not changeable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:408
+#: plugins/personal/posix/class_posixAccount.inc:411
 msgid "UID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:530
 #, php-format
 msgid "Group of user %s"
 msgstr ""
@@ -1584,8 +1583,8 @@ msgid "Session lifetime"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:207
-msgid "Defines when a session will expire in seconds."
-msgstr "Defina em quantos segundos a sessÃ£o irÃ¡ expirar."
+msgid "Defines when a session will expire in seconds (0 to disable)."
+msgstr ""
 
 #: plugins/config/class_configInLdap.inc:212
 msgid "HTTP authentication"
@@ -2165,7 +2164,7 @@ msgstr "Selecionar tudo"
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:790
-#: include/class_plugin.inc:1518 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1521 include/class_CopyPasteHandler.inc:276
 #: include/simpleplugin/class_attribute.inc:1571
 #: include/simpleplugin/class_attribute.inc:1574
 #: include/simpleplugin/class_attribute.inc:1577
@@ -2178,7 +2177,7 @@ msgstr "Selecionar tudo"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:471 html/index.php:481
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2302,7 +2301,7 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr "Erro de configuraÃ§Ã£o"
 
@@ -2324,7 +2323,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:367 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3416,7 +3415,7 @@ msgid ""
 "\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
 msgstr ""
 
-#: include/class_plugin.inc:1316
+#: include/class_plugin.inc:1319
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3526,39 +3525,39 @@ msgstr "Nenhum"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: include/simpleplugin/class_helpersAttribute.inc:260
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:261
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:262
+#: include/simpleplugin/class_helpersAttribute.inc:266
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_helpersAttribute.inc:267
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:275
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr "segundos"
 
-#: include/simpleplugin/class_helpersAttribute.inc:276
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:277
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr "dias"
 
@@ -3741,127 +3740,132 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr "objectType especificado estÃ¡ vazio ou invÃ¡lido!"
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
-msgstr "A sessÃ£o nÃ£o estÃ¡ encriptada!"
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
+msgstr ""
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
-msgstr "O tempo de sessÃ£o configurado no seu fusiondirectory.conf serÃ¡ sobrescrito pelas configuraÃ§Ãµes do php.ini."
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
+msgstr ""
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr "Arquivo de configuraÃ§Ã£o %s/%s do FusionDirectory nÃ£o estÃ¡ legÃvel. Por favor, execute fusiondirectory-setup --check-config para corrigir isto."
 
-#: html/index.php:172
+#: html/index.php:171
 msgid "Smarty error"
 msgstr "Erro Smarty"
 
-#: html/index.php:174
+#: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:209
+#: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
 msgstr "Sua sessÃ£o foi encerrada!"
 
-#: html/index.php:212
+#: html/index.php:211
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:214
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:218
+#: html/index.php:217
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:279
+#: html/index.php:278
 msgid "Please specify a valid username!"
 msgstr "Por favor, especifique um nome de usuÃ¡rio vÃ¡lido!"
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify your password!"
 msgstr "Por favor, especifique sua senha!"
 
-#: html/index.php:301
+#: html/index.php:300
 msgid "Please check the username/password combination."
 msgstr "Por favor, verifique o usuÃ¡rio ou senha."
 
-#: html/index.php:331
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Conta bloqueada. Entre em contato com o administrador do sistema!"
 
-#: html/index.php:473
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:483
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:520
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr "Cookies estÃ£o desabilitados. Por favor, habilite os cookies em seu navegador e atualize esta pÃ¡gina antes de efetuar o login!"
 
-#: html/main.php:113
+#: html/main.php:115
 msgid "PHP configuration"
 msgstr "ConfiguraÃ§Ã£o PHP"
 
-#: html/main.php:114
+#: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr "Erro fatal: O registro global do PHP, register_globals, estÃ¡ ativado. NÃ£o serÃ¡ possÃvel realizar login enquanto o problema nÃ£o for solucionado por um administrador."
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Password change"
 msgstr "MudanÃ§a de senha"
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
 msgstr "Sua senha estÃ¡ prestes a expirar. Por favor, altere a senha!"
 
-#: html/main.php:205
+#: html/main.php:158
+msgid "Your password has expired, please set a new one."
+msgstr ""
+
+#: html/main.php:208
 msgid "Running out of memory!"
 msgstr "MemÃ³ria virtual baixa!"
 
-#: html/main.php:248
+#: html/main.php:251
 msgid "User ACL checks disabled"
 msgstr "Checagem de UsuÃ¡rio de ACL desativada"
 
-#: html/main.php:286
+#: html/main.php:289
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/main.php:287
+#: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
 msgstr ""
 
-#: html/main.php:302
+#: html/main.php:305
 msgid "Configuration Error"
 msgstr "Erro de ConfiguraÃ§Ã£o"
 
-#: html/main.php:303
+#: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
@@ -3878,52 +3882,44 @@ msgstr "Abortado. ConfiguraÃ§Ã£o %s/%s do FusionDirectory nÃ£o pÃ´de ser lida."
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "DiretÃ³rio '%s' especificado como diretÃ³rio de compilaÃ§Ã£o nÃ£o estÃ¡ acessÃvel!"
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr "SessÃ£o nÃ£o serÃ¡ encriptada"
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr "Entrar em sessÃ£o SSL"
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:68
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr "EndereÃ§o de email"
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr "Entre em contato com o administrador, houve um problema com o servidor de e-mail."
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4524,15 +4520,15 @@ msgid ""
 "'Off'."
 msgstr "Pesquisar por 'zend.ze1_compatibility_mode' no seu php.ini e defina-o como 'Desligado'."
 
-#: setup/class_setup.inc:127
+#: setup/class_setup.inc:122
 msgid "Setup error"
 msgstr "Erro de configuraÃ§Ã£o"
 
-#: setup/class_setup.inc:207
+#: setup/class_setup.inc:202
 msgid "Completed"
 msgstr "ConcluÃdo"
 
-#: setup/class_setup.inc:250
+#: setup/class_setup.inc:245
 msgid "Next"
 msgstr "PrÃ³ximo"
 
@@ -4781,72 +4777,78 @@ msgstr "Ignorar este erro e mostrar todas as entradas que se enquadram no limite
 msgid "Set"
 msgstr "Definir"
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
+#: ihtml/themes/default/recovery.tpl.c:8
+msgid "Lost password"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:11
-msgid "Lost password"
+msgid ""
+"Informations to reset password for %1 have been sent to email address %2"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:14
+msgid "Warning : this email is only valid for %1 minutes."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:17
 #: ihtml/themes/default/recovery.tpl.c:20
-#: ihtml/themes/default/recovery.tpl.c:62
-#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr "DiretÃ³rio"
 
-#: ihtml/themes/default/recovery.tpl.c:32
 #: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "Nova senha repetida"
 
-#: ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr "Grau de seguranÃ§a da senha"
 
-#: ihtml/themes/default/recovery.tpl.c:41
-#: ihtml/themes/default/recovery.tpl.c:74
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr "Alterar"
 
-#: ihtml/themes/default/recovery.tpl.c:44
-#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr "Clique aqui para alterar sua senha"
 
-#: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/recovery.tpl.c:53
 msgid "Success"
 msgstr "Sucesso"
 
-#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr "Sua senha foi alterada com sucesso."
 
-#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
+"=> Use your e-mail in the long format, e.g : John Doe => "
+"john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:71
-msgid "Mail"
-msgstr "Correio"
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
+msgstr "Email"
 
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
diff --git a/locale/ru/fusiondirectory.po b/locale/ru/fusiondirectory.po
index abc3255da02ac0defca7743a5337d4fffeafef93..78c355e1405e3d971cba776a97a44b6c6977c6d0 100644
--- a/locale/ru/fusiondirectory.po
+++ b/locale/ru/fusiondirectory.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-10 13:25+0200\n"
-"PO-Revision-Date: 2016-06-03 11:03+0000\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
+"PO-Revision-Date: 2016-06-25 10:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -146,7 +146,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_group.inc:73
 #: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:414
 msgid "GID"
 msgstr "GID"
 
@@ -203,11 +203,10 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467 include/functions.inc:799
+#: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:520 html/class_passwordRecovery.inc:169
-#: setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -219,7 +218,7 @@ msgid "Warning"
 msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
@@ -564,7 +563,7 @@ msgstr "Ð˜Ð¼Ñ"
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
@@ -935,7 +934,7 @@ msgstr "ÐŸÑ€Ð¸Ð¼ÐµÐ½ÑÐµÐ¼Ñ‹Ð¹ Ð¼ÐµÑ‚Ð¾Ð´ Ð´Ð»Ñ Ñ…ÑÑˆÐ° Ð¿Ð°Ñ€Ð¾Ð»Ñ"
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1153,8 +1152,8 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:654
-#: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:32
 msgid "New password"
 msgstr "ÐÐ¾Ð²Ñ‹Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 
@@ -1339,11 +1338,11 @@ msgstr "ÑÑ€Ð¾Ðº Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ Ð¿Ð°Ñ€Ð°Ð»Ñ Ð¸ÑÑ‚ÐµÐº"
 msgid "password not changeable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:408
+#: plugins/personal/posix/class_posixAccount.inc:411
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:530
 #, php-format
 msgid "Group of user %s"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ð° Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %s"
@@ -1585,8 +1584,8 @@ msgid "Session lifetime"
 msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¶Ð¸Ð·Ð½Ð¸ ÑÐµÑÑÐ¸Ð¸"
 
 #: plugins/config/class_configInLdap.inc:207
-msgid "Defines when a session will expire in seconds."
-msgstr "ÐžÐ¿Ñ€ÐµÐ´ÐµÐ»ÑÐµÑ‚, Ñ‡ÐµÑ€ÐµÐ· ÑÐºÐ¾Ð»ÑŒÐºÐ¾ ÑÐµÐºÑƒÐ½Ð´ ÑÐµÑÑÐ¸Ñ Ð±ÑƒÐ´ÐµÑ‚ Ð·Ð°ÐºÐ¾Ð½Ñ‡ÐµÐ½Ð°."
+msgid "Defines when a session will expire in seconds (0 to disable)."
+msgstr ""
 
 #: plugins/config/class_configInLdap.inc:212
 msgid "HTTP authentication"
@@ -2166,7 +2165,7 @@ msgstr "Ð’Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ Ð²ÑÐµ"
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:790
-#: include/class_plugin.inc:1518 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1521 include/class_CopyPasteHandler.inc:276
 #: include/simpleplugin/class_attribute.inc:1571
 #: include/simpleplugin/class_attribute.inc:1574
 #: include/simpleplugin/class_attribute.inc:1577
@@ -2179,7 +2178,7 @@ msgstr "Ð’Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ Ð²ÑÐµ"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:471 html/index.php:481
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2303,7 +2302,7 @@ msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° XML Ð² fusiondirectory.conf: %s Ð² ÑÑ‚Ñ€Ð¾ÐºÐµ %d"
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸"
 
@@ -2325,7 +2324,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:367 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3417,7 +3416,7 @@ msgid ""
 "\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
 msgstr ""
 
-#: include/class_plugin.inc:1316
+#: include/class_plugin.inc:1319
 #, php-format
 msgid "Tab \"%s\""
 msgstr "Ð’ÐºÐ»Ð°Ð´ÐºÐ° \"%s\""
@@ -3527,39 +3526,39 @@ msgstr ""
 msgid "Unknown"
 msgstr "ÐÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ð¾"
 
-#: include/simpleplugin/class_helpersAttribute.inc:260
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "B"
 msgstr "B"
 
-#: include/simpleplugin/class_helpersAttribute.inc:261
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "KiB"
 msgstr "KiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:262
+#: include/simpleplugin/class_helpersAttribute.inc:266
 msgid "MiB"
 msgstr "MiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_helpersAttribute.inc:267
 msgid "GiB"
 msgstr "GiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "TiB"
 msgstr "TiB"
 
-#: include/simpleplugin/class_helpersAttribute.inc:275
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr "ÑÐµÐºÑƒÐ½Ð´Ñ‹"
 
-#: include/simpleplugin/class_helpersAttribute.inc:276
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr "Ð¼Ð¸Ð½ÑƒÑ‚Ñ‹"
 
-#: include/simpleplugin/class_helpersAttribute.inc:277
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr "Ñ‡Ð°ÑÑ‹"
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr "Ð´Ð½Ð¸"
 
@@ -3742,127 +3741,132 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr "Ð£ÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ð¹ Ð¾Ð±ÑŠÐµÐºÑ‚Ð½Ñ‹Ð¹ Ñ‚Ð¸Ð¿ Ð¿ÑƒÑÑ‚Ð¾Ð¹ Ð¸Ð»Ð¸ Ð½ÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹!"
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
-msgstr "Ð¡ÐµÑÑÐ¸Ñ Ð½Ðµ Ð·Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð°!"
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
+msgstr ""
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
-msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¶Ð¸Ð·Ð½Ð¸ ÑÐµÑÑÐ¸Ð¸ Ð½Ð°ÑÑ‚Ñ€Ð°Ð¸Ð²Ð°ÐµÑ‚ÑÑ Ð² Ð²Ð°ÑˆÐµÐ¼ fusiondirectory.conf Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¿ÐµÑ€ÐµÐ¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð° Ð² Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ°Ñ… php.ini."
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
+msgstr ""
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr "ÐÐµ Ð¿Ñ€Ð¾Ñ‡ÐµÑÑ‚ÑŒ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸ÑŽ FusionDirectory %s/%s. Ð§Ñ‚Ð¾Ð±Ñ‹ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ ÑÑ‚Ð¾ Ð¿Ð¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð° Ð·Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚Ðµ  fusiondirectory-setup --check-config."
 
-#: html/index.php:172
+#: html/index.php:171
 msgid "Smarty error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Smarty"
 
-#: html/index.php:174
+#: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:209
+#: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
 msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð²Ð°ÑˆÐµÐ¹ ÑÐµÑÑÐ¸Ð¸ Ð¸ÑÑ‚ÐµÐºÐ»Ð¾!"
 
-#: html/index.php:212
+#: html/index.php:211
 msgid "Your IP has changed!"
 msgstr "Ð’Ð°Ñˆ IP Ð°Ð´Ñ€ÐµÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½!"
 
-#: html/index.php:215
+#: html/index.php:214
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:218
+#: html/index.php:217
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:279
+#: html/index.php:278
 msgid "Please specify a valid username!"
 msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾Ðµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ!"
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify your password!"
 msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ ÑÐ²Ð¾Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ!"
 
-#: html/index.php:301
+#: html/index.php:300
 msgid "Please check the username/password combination."
 msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€ÑŒÑ‚Ðµ, Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ Ð»Ð¸ Ð²Ñ‹ Ð²Ð²ÐµÐ»Ð¸ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ."
 
-#: html/index.php:331
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Ð£Ñ‡ÐµÑ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð°. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð° ÑÐ²ÑÐ¶Ð¸Ñ‚ÐµÑÑŒ Ñ Ð²Ð°ÑˆÐ¸Ð¼ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ð¼ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð¾Ð¼."
 
-#: html/index.php:473
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:483
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:520
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr "Ð’ Ð²Ð°ÑˆÐµÐ¼ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€Ðµ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ñ‹ ÐºÑƒÐºÐ¸. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð° Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ðµ Ð¸Ñ… Ð¸ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚Ðµ ÑÑ‚Ñƒ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ñƒ Ð¿ÐµÑ€ÐµÐ´ Ð²Ñ…Ð¾Ð´Ð¾Ð¼ Ð² ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ! "
 
-#: html/main.php:113
+#: html/main.php:115
 msgid "PHP configuration"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ PHP"
 
-#: html/main.php:114
+#: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr "ÐšÑ€Ð¸Ñ‚Ð¸Ñ‡ÐµÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°: Register globals is on. FusionDirectory Ð½Ðµ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚ Ð·Ð°Ð»Ð¾Ð³Ð¸Ð½Ð¸Ñ‚ÑŒÑÑ Ð´Ð¾ Ñ‚ÐµÑ… Ð¿Ð¾Ñ€ Ð¿Ð¾ÐºÐ° ÑÑ‚Ð¾ Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¾ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð¾Ð¼."
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Password change"
 msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
 msgstr "Ð¡Ñ€Ð¾Ðº Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð¿Ð¾Ñ‡Ñ‚Ð¸ Ð·Ð°ÐºÐ¾Ð½Ñ‡Ð¸Ð»ÑÑ, Ð¿Ð¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð° Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚Ðµ ÐµÐ³Ð¾!"
 
-#: html/main.php:205
+#: html/main.php:158
+msgid "Your password has expired, please set a new one."
+msgstr ""
+
+#: html/main.php:208
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:248
+#: html/main.php:251
 msgid "User ACL checks disabled"
 msgstr ""
 
-#: html/main.php:286
+#: html/main.php:289
 msgid "Plugin"
 msgstr "ÐŸÐ»Ð°Ð³Ð¸Ð½"
 
-#: html/main.php:287
+#: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
 msgstr ""
 
-#: html/main.php:302
+#: html/main.php:305
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:303
+#: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
@@ -3879,52 +3883,44 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr "Ð”Ð°Ð½Ð½Ñ‹Ðµ, Ð¿ÐµÑ€ÐµÐ´Ð°Ð²Ð°ÐµÐ¼Ñ‹Ðµ Ð² Ñ‚ÐµÑ‡ÐµÐ½Ð¸Ðµ ÑÑ‚Ð¾Ð³Ð¾ ÑÐµÐ°Ð½ÑÐ°, Ð½Ðµ Ð±ÑƒÐ´ÑƒÑ‚ Ð·Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ñ‹."
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ SSL"
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr "ÐÐ°Ð¹Ð´ÐµÐ½Ð¾ Ð¼Ð½Ð¾Ð¶ÐµÑÑ‚Ð²Ð¾ ÑƒÑ‡ÐµÑ‚Ð½Ñ‹Ñ… Ð·Ð°Ð¿Ð¸ÑÐµÐ¹ Ñ Ð»Ð¾Ð³Ð¸Ð½Ð¾Ð¼ \"%s\""
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:68
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr "ÐÐ´Ñ€ÐµÑ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr "Ð¡Ð²ÑÐ¶Ð¸Ñ‚ÐµÑÑŒ Ñ Ð²Ð°ÑˆÐ¸Ð¼ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ñ‹Ð¼ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð¾Ð¼, Ð±Ñ‹Ð»Ð¸ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹ Ñ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ð¼ ÑÐµÑ€Ð²ÐµÑ€Ð¾Ð¼"
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr "Ð‘Ñ‹Ð»Ð¸ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹ Ñ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ð¼ ÑÐµÑ€Ð²ÐµÑ€Ð¾Ð¼, Ð¸Ð¼ÑÐ¹Ð» Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð½Ðµ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ñ‹"
 
@@ -4525,15 +4521,15 @@ msgid ""
 "'Off'."
 msgstr "ÐÐ°Ð¹Ð´Ð¸Ñ‚Ðµ 'zend.ze1_compatibility_mode' Ð² Ð²Ð°ÑˆÐµÐ¼ php.ini Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ðµ Ð² 'Off'."
 
-#: setup/class_setup.inc:127
+#: setup/class_setup.inc:122
 msgid "Setup error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
 
-#: setup/class_setup.inc:207
+#: setup/class_setup.inc:202
 msgid "Completed"
 msgstr "Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾"
 
-#: setup/class_setup.inc:250
+#: setup/class_setup.inc:245
 msgid "Next"
 msgstr "Ð”Ð°Ð»ÐµÐµ"
 
@@ -4796,72 +4792,78 @@ msgstr ""
 msgid "Set"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ"
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
-msgstr "FusionDirectory Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿Ð°Ñ€Ð¾Ð»Ñ"
-
-#: ihtml/themes/default/recovery.tpl.c:11
+#: ihtml/themes/default/recovery.tpl.c:8
 msgid "Lost password"
 msgstr "Ð—Ð°Ð±Ñ‹Ð»Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 
+#: ihtml/themes/default/recovery.tpl.c:11
+msgid ""
+"Informations to reset password for %1 have been sent to email address %2"
+msgstr ""
+
 #: ihtml/themes/default/recovery.tpl.c:14
+msgid "Warning : this email is only valid for %1 minutes."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr "ÐÑ‚Ð¾Ñ‚ Ð´Ð¸Ð°Ð»Ð¾Ð³ Ð¿Ñ€ÐµÐ´Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½ Ð´Ð»Ñ ÑÐ¼ÐµÐ½Ñ‹ Ð¿Ð°Ñ€Ð¾Ð»Ñ. Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð½Ð¾Ð²Ñ‹Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð´Ð²Ð°Ð¶Ð´Ñ‹ Ð² Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ðµ Ð½Ð¸Ð¶Ðµ Ð¿Ð¾Ð»Ñ Ð¸ Ð½Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ ÐºÐ½Ð¾Ð¿ÐºÑƒ \"Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ\"."
 
-#: ihtml/themes/default/recovery.tpl.c:17
 #: ihtml/themes/default/recovery.tpl.c:20
-#: ihtml/themes/default/recovery.tpl.c:62
-#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr "ÐšÐ°Ñ‚Ð°Ð»Ð¾Ð³"
 
-#: ihtml/themes/default/recovery.tpl.c:32
 #: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr "ÐÐ°Ð´ÐµÐ¶Ð½Ð¾ÑÑ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»Ñ"
 
-#: ihtml/themes/default/recovery.tpl.c:41
-#: ihtml/themes/default/recovery.tpl.c:74
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ"
 
-#: ihtml/themes/default/recovery.tpl.c:44
-#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr "ÐÐ°Ð¶Ð¼Ð¸Ñ‚Ðµ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÑÐ¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 
-#: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/recovery.tpl.c:53
 msgid "Success"
 msgstr "Ð£ÑÐ¿ÐµÑˆÐ½Ð¾"
 
-#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr "Ð’Ð°Ñˆ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð±Ñ‹Ð» ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½."
 
-#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð²Ð°Ñˆ Ñ‚ÐµÐºÑƒÑ‰Ð¸Ð¹ Ð°Ð´Ñ€ÐµÑ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹ Ð² Ð½Ð¸Ð¶Ð½Ð¸Ðµ Ð¿Ð¾Ð»Ðµ Ð¸ Ð½Ð°Ð¶Ð¼Ð¸Ñ‚Ðµ ÐºÐ½Ð¾Ð¿ÐºÑƒ 'Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ'."
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
+"=> Use your e-mail in the long format, e.g : John Doe => "
+"john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:71
-msgid "Mail"
-msgstr "ÐŸÐ¾Ñ‡Ñ‚Ð°"
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
+msgstr "Email"
 
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
diff --git a/locale/ru@petr1708/fusiondirectory.po b/locale/ru@petr1708/fusiondirectory.po
index 6d196498e0adb9b945c42d8ad7d682caa667059b..4f323b70e1941f92f15ada85843041391080e46b 100644
--- a/locale/ru@petr1708/fusiondirectory.po
+++ b/locale/ru@petr1708/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-10 13:25+0200\n"
-"PO-Revision-Date: 2016-06-03 11:03+0000\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
+"PO-Revision-Date: 2016-06-25 10:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -144,7 +144,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_group.inc:73
 #: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:414
 msgid "GID"
 msgstr ""
 
@@ -201,11 +201,10 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467 include/functions.inc:799
+#: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:520 html/class_passwordRecovery.inc:169
-#: setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -217,7 +216,7 @@ msgid "Warning"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
@@ -562,7 +561,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr ""
 
@@ -933,7 +932,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1151,8 +1150,8 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:654
-#: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:32
 msgid "New password"
 msgstr ""
 
@@ -1337,11 +1336,11 @@ msgstr ""
 msgid "password not changeable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:408
+#: plugins/personal/posix/class_posixAccount.inc:411
 msgid "UID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:530
 #, php-format
 msgid "Group of user %s"
 msgstr ""
@@ -1583,7 +1582,7 @@ msgid "Session lifetime"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:207
-msgid "Defines when a session will expire in seconds."
+msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:212
@@ -2164,7 +2163,7 @@ msgstr ""
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:790
-#: include/class_plugin.inc:1518 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1521 include/class_CopyPasteHandler.inc:276
 #: include/simpleplugin/class_attribute.inc:1571
 #: include/simpleplugin/class_attribute.inc:1574
 #: include/simpleplugin/class_attribute.inc:1577
@@ -2177,7 +2176,7 @@ msgstr ""
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:471 html/index.php:481
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2301,7 +2300,7 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr ""
 
@@ -2323,7 +2322,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:367 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3415,7 +3414,7 @@ msgid ""
 "\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
 msgstr ""
 
-#: include/class_plugin.inc:1316
+#: include/class_plugin.inc:1319
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3525,39 +3524,39 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:260
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:261
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:262
+#: include/simpleplugin/class_helpersAttribute.inc:266
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_helpersAttribute.inc:267
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:275
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:276
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:277
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
@@ -3740,127 +3739,132 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:172
+#: html/index.php:171
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:174
+#: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:209
+#: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:212
+#: html/index.php:211
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:214
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:218
+#: html/index.php:217
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:279
+#: html/index.php:278
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:301
+#: html/index.php:300
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:331
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:473
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:483
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:520
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr ""
 
-#: html/main.php:113
+#: html/main.php:115
 msgid "PHP configuration"
 msgstr ""
 
-#: html/main.php:114
+#: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Password change"
 msgstr ""
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:205
+#: html/main.php:158
+msgid "Your password has expired, please set a new one."
+msgstr ""
+
+#: html/main.php:208
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:248
+#: html/main.php:251
 msgid "User ACL checks disabled"
 msgstr ""
 
-#: html/main.php:286
+#: html/main.php:289
 msgid "Plugin"
 msgstr ""
 
-#: html/main.php:287
+#: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
 msgstr ""
 
-#: html/main.php:302
+#: html/main.php:305
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:303
+#: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
@@ -3877,52 +3881,44 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr ""
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr ""
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:68
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4523,15 +4519,15 @@ msgid ""
 "'Off'."
 msgstr ""
 
-#: setup/class_setup.inc:127
+#: setup/class_setup.inc:122
 msgid "Setup error"
 msgstr ""
 
-#: setup/class_setup.inc:207
+#: setup/class_setup.inc:202
 msgid "Completed"
 msgstr ""
 
-#: setup/class_setup.inc:250
+#: setup/class_setup.inc:245
 msgid "Next"
 msgstr ""
 
@@ -4794,72 +4790,78 @@ msgstr ""
 msgid "Set"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
+#: ihtml/themes/default/recovery.tpl.c:8
+msgid "Lost password"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:11
-msgid "Lost password"
+msgid ""
+"Informations to reset password for %1 have been sent to email address %2"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:14
+msgid "Warning : this email is only valid for %1 minutes."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:17
 #: ihtml/themes/default/recovery.tpl.c:20
-#: ihtml/themes/default/recovery.tpl.c:62
-#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:32
 #: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:41
-#: ihtml/themes/default/recovery.tpl.c:74
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:44
-#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/recovery.tpl.c:53
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
+"=> Use your e-mail in the long format, e.g : John Doe => "
+"john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:71
-msgid "Mail"
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
diff --git a/locale/sv/fusiondirectory.po b/locale/sv/fusiondirectory.po
index a992d61752977fc1ca1038713055b6a7444e6bde..9a91351bfd17ac9334d80f767591f6ee2d1e94ed 100644
--- a/locale/sv/fusiondirectory.po
+++ b/locale/sv/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-10 13:25+0200\n"
-"PO-Revision-Date: 2016-06-03 11:03+0000\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
+"PO-Revision-Date: 2016-06-25 10:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -144,7 +144,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_group.inc:73
 #: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:414
 msgid "GID"
 msgstr "GID"
 
@@ -201,11 +201,10 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467 include/functions.inc:799
+#: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:520 html/class_passwordRecovery.inc:169
-#: setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -217,7 +216,7 @@ msgid "Warning"
 msgstr "Varning"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr "Timeout under vÃ¤ntan pÃ¥ lÃ¥sning. Ignorerar lÃ¥s!"
 
@@ -562,7 +561,7 @@ msgstr "FÃ¶rnamn"
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr "AnvÃ¤ndarnamn"
 
@@ -933,7 +932,7 @@ msgstr "LÃ¶senords-hash att anvÃ¤nda"
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1151,8 +1150,8 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:654
-#: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:32
 msgid "New password"
 msgstr "Nytt lÃ¶senord"
 
@@ -1337,11 +1336,11 @@ msgstr "lÃ¶senord har slutat gÃ¤lla"
 msgid "password not changeable"
 msgstr "lÃ¶senord kan inte Ã¤ndras"
 
-#: plugins/personal/posix/class_posixAccount.inc:408
+#: plugins/personal/posix/class_posixAccount.inc:411
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:530
 #, php-format
 msgid "Group of user %s"
 msgstr ""
@@ -1583,8 +1582,8 @@ msgid "Session lifetime"
 msgstr "Sessioners livslÃ¤ngd"
 
 #: plugins/config/class_configInLdap.inc:207
-msgid "Defines when a session will expire in seconds."
-msgstr "Definierar nÃ¤r en session lÃ¶per ut, i sekunder."
+msgid "Defines when a session will expire in seconds (0 to disable)."
+msgstr ""
 
 #: plugins/config/class_configInLdap.inc:212
 msgid "HTTP authentication"
@@ -2164,7 +2163,7 @@ msgstr "VÃ¤lj alla"
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:790
-#: include/class_plugin.inc:1518 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1521 include/class_CopyPasteHandler.inc:276
 #: include/simpleplugin/class_attribute.inc:1571
 #: include/simpleplugin/class_attribute.inc:1574
 #: include/simpleplugin/class_attribute.inc:1577
@@ -2177,7 +2176,7 @@ msgstr "VÃ¤lj alla"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:471 html/index.php:481
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2301,7 +2300,7 @@ msgstr "XML-fel i fusiondirectory.conf: %s pÃ¥ rad %d"
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr "Konfigurationsfel"
 
@@ -2323,7 +2322,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:367 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3415,7 +3414,7 @@ msgid ""
 "\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
 msgstr ""
 
-#: include/class_plugin.inc:1316
+#: include/class_plugin.inc:1319
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3525,39 +3524,39 @@ msgstr "Ingen"
 msgid "Unknown"
 msgstr "OkÃ¤nd"
 
-#: include/simpleplugin/class_helpersAttribute.inc:260
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:261
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:262
+#: include/simpleplugin/class_helpersAttribute.inc:266
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_helpersAttribute.inc:267
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:275
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr "sekunder"
 
-#: include/simpleplugin/class_helpersAttribute.inc:276
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:277
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
@@ -3740,127 +3739,132 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr "Angiven objectType Ã¤r tom eller ogiltig!"
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
-msgstr "Sessionen Ã¤r inte krypterad!"
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
+msgstr ""
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
-msgstr "Sessionens lifetime som konfigurerats i din fusiondirectory.conf kommer att Ã¶vertrumfas av instÃ¤llningar i php.ini"
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
+msgstr ""
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr "FusionDirectory-konfiguration %s/%s Ã¤r inte lÃ¤sbar. VÃ¤nligen kÃ¶r fusiondirectory-setup --check-config fÃ¶r att Ã¥tgÃ¤rda detta."
 
-#: html/index.php:172
+#: html/index.php:171
 msgid "Smarty error"
 msgstr "Smarty-fel"
 
-#: html/index.php:174
+#: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:209
+#: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
 msgstr "Din FusionDirectory-session har gÃ¥tt ut!"
 
-#: html/index.php:212
+#: html/index.php:211
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:214
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:218
+#: html/index.php:217
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:279
+#: html/index.php:278
 msgid "Please specify a valid username!"
 msgstr "Ange ett giltigt anvÃ¤ndarnamn!"
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify your password!"
 msgstr "Ange ditt lÃ¶senord!"
 
-#: html/index.php:301
+#: html/index.php:300
 msgid "Please check the username/password combination."
 msgstr "Kontrollera anvÃ¤ndarnamn/lÃ¶senord-kombinationen."
 
-#: html/index.php:331
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Kontot lÃ¥st. Kontakta systemadministratÃ¶ren!"
 
-#: html/index.php:473
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:483
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:520
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr "Din webblÃ¤sare har avaktiverat cookies. VÃ¤nligen aktivera cookies och ladda om den hÃ¤r sidan innan du loggar in!"
 
-#: html/main.php:113
+#: html/main.php:115
 msgid "PHP configuration"
 msgstr "PHP-konfiguration"
 
-#: html/main.php:114
+#: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr "Allvarligt fel: Register globals Ã¤r pÃ¥slaget. FusionDirectory kommer att vÃ¤gra logga in om inte detta Ã¤r Ã¥tgÃ¤rdat av en administratÃ¶r"
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Password change"
 msgstr "Ã„ndra lÃ¶senord"
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
 msgstr "Ditt lÃ¶senord Ã¤r pÃ¥ vÃ¤g att gÃ¥ ut, vÃ¤nligen byt lÃ¶senord!"
 
-#: html/main.php:205
+#: html/main.php:158
+msgid "Your password has expired, please set a new one."
+msgstr ""
+
+#: html/main.php:208
 msgid "Running out of memory!"
 msgstr "TillgÃ¤ngligt minne snart slut!"
 
-#: html/main.php:248
+#: html/main.php:251
 msgid "User ACL checks disabled"
 msgstr "ACL-kontroll av anvÃ¤ndare Ã¤r inte pÃ¥slaget"
 
-#: html/main.php:286
+#: html/main.php:289
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/main.php:287
+#: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
 msgstr "Allvarligt fel: Kan inte hitta nÃ¥gra plugin-definitioner fÃ¶r pluginen '%s' ('%s' Ã¤r ingen fil)!"
 
-#: html/main.php:302
+#: html/main.php:305
 msgid "Configuration Error"
 msgstr "Konfigurationsfel"
 
-#: html/main.php:303
+#: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
@@ -3877,52 +3881,44 @@ msgstr "FusionDirectory-konfiguration %s/%s Ã¤r inte lÃ¤sbar. Avbryter."
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "Katalogen '%s' specificerat som kompileringskatalog Ã¤r inte tillgÃ¤nglig!"
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr "Sessionen kommer inte att vara krypterad."
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr "PÃ¥bÃ¶rja SSL-session"
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:68
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr "Epostadress"
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr "Kontakta din administratÃ¶r, det uppstod ett problem med epostservern"
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr "Det uppstod ett problem med epostservern, bekrÃ¤ftelsebrevet skickades inte"
 
@@ -4523,15 +4519,15 @@ msgid ""
 "'Off'."
 msgstr "SÃ¶k efter 'zend.ze1_compatibility_mode' i php.ini och sÃ¤tt den till 'Off'."
 
-#: setup/class_setup.inc:127
+#: setup/class_setup.inc:122
 msgid "Setup error"
 msgstr "Installationsfel"
 
-#: setup/class_setup.inc:207
+#: setup/class_setup.inc:202
 msgid "Completed"
 msgstr "SlutfÃ¶rd"
 
-#: setup/class_setup.inc:250
+#: setup/class_setup.inc:245
 msgid "Next"
 msgstr "NÃ¤sta"
 
@@ -4780,72 +4776,78 @@ msgstr "ignorera det hÃ¤r felet och visa alla poster som passar inom den definie
 msgid "Set"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
-msgstr "FusionDirectory lÃ¶senordsÃ¥terstÃ¤llning"
-
-#: ihtml/themes/default/recovery.tpl.c:11
+#: ihtml/themes/default/recovery.tpl.c:8
 msgid "Lost password"
 msgstr "FÃ¶rlorat lÃ¶senord"
 
+#: ihtml/themes/default/recovery.tpl.c:11
+msgid ""
+"Informations to reset password for %1 have been sent to email address %2"
+msgstr ""
+
 #: ihtml/themes/default/recovery.tpl.c:14
+msgid "Warning : this email is only valid for %1 minutes."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr "Den hÃ¤r dialogrutan erbjuder ett enkelt sÃ¤tt att byta lÃ¶senord. Skriv in ditt nuvarande lÃ¶senord och det nya lÃ¶senordet (tvÃ¥ gÃ¥nger) i fÃ¤lten nedan och tryck pÃ¥ 'Byt'-knappen."
 
-#: ihtml/themes/default/recovery.tpl.c:17
 #: ihtml/themes/default/recovery.tpl.c:20
-#: ihtml/themes/default/recovery.tpl.c:62
-#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr "Katalog"
 
-#: ihtml/themes/default/recovery.tpl.c:32
 #: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "Repetera nytt lÃ¶senord"
 
-#: ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr "LÃ¶senordsstyrka"
 
-#: ihtml/themes/default/recovery.tpl.c:41
-#: ihtml/themes/default/recovery.tpl.c:74
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr "Byt"
 
-#: ihtml/themes/default/recovery.tpl.c:44
-#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr "Klicka hÃ¤r fÃ¶r att byta lÃ¶senord"
 
-#: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/recovery.tpl.c:53
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr "Ditt lÃ¶senord har nu bytts."
 
-#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr "Skriv in din nuvarande epostadress i fÃ¤ltet nedan och tryck pÃ¥ 'Byt'-knappen"
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
-msgstr "=> AnvÃ¤nd din epostadress i det lÃ¥nga formatet, t ex : John Doe => john.doe@ibcp.fr"
+"=> Use your e-mail in the long format, e.g : John Doe => "
+"john.doe@example.com"
+msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:71
-msgid "Mail"
-msgstr "Epost"
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
+msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
diff --git a/locale/ug/fusiondirectory.po b/locale/ug/fusiondirectory.po
index d9825230f6e9d2c9eac644169cb8582e7f7d7233..32144c86cd4893d42c42b8a592fac3138db33192 100644
--- a/locale/ug/fusiondirectory.po
+++ b/locale/ug/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-10 13:25+0200\n"
-"PO-Revision-Date: 2016-06-03 11:03+0000\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
+"PO-Revision-Date: 2016-06-25 10:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Uighur (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -144,7 +144,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_group.inc:73
 #: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:414
 msgid "GID"
 msgstr ""
 
@@ -201,11 +201,10 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467 include/functions.inc:799
+#: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:520 html/class_passwordRecovery.inc:169
-#: setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -217,7 +216,7 @@ msgid "Warning"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
@@ -562,7 +561,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr ""
 
@@ -933,7 +932,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1151,8 +1150,8 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:654
-#: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:32
 msgid "New password"
 msgstr ""
 
@@ -1337,11 +1336,11 @@ msgstr ""
 msgid "password not changeable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:408
+#: plugins/personal/posix/class_posixAccount.inc:411
 msgid "UID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:530
 #, php-format
 msgid "Group of user %s"
 msgstr ""
@@ -1583,7 +1582,7 @@ msgid "Session lifetime"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:207
-msgid "Defines when a session will expire in seconds."
+msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:212
@@ -2164,7 +2163,7 @@ msgstr ""
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:790
-#: include/class_plugin.inc:1518 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1521 include/class_CopyPasteHandler.inc:276
 #: include/simpleplugin/class_attribute.inc:1571
 #: include/simpleplugin/class_attribute.inc:1574
 #: include/simpleplugin/class_attribute.inc:1577
@@ -2177,7 +2176,7 @@ msgstr ""
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:471 html/index.php:481
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2301,7 +2300,7 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr ""
 
@@ -2323,7 +2322,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:367 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3415,7 +3414,7 @@ msgid ""
 "\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
 msgstr ""
 
-#: include/class_plugin.inc:1316
+#: include/class_plugin.inc:1319
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3525,39 +3524,39 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:260
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:261
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:262
+#: include/simpleplugin/class_helpersAttribute.inc:266
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_helpersAttribute.inc:267
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:275
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:276
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:277
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
@@ -3740,127 +3739,132 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:172
+#: html/index.php:171
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:174
+#: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:209
+#: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:212
+#: html/index.php:211
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:214
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:218
+#: html/index.php:217
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:279
+#: html/index.php:278
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:301
+#: html/index.php:300
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:331
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:473
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:483
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:520
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr ""
 
-#: html/main.php:113
+#: html/main.php:115
 msgid "PHP configuration"
 msgstr ""
 
-#: html/main.php:114
+#: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Password change"
 msgstr ""
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:205
+#: html/main.php:158
+msgid "Your password has expired, please set a new one."
+msgstr ""
+
+#: html/main.php:208
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:248
+#: html/main.php:251
 msgid "User ACL checks disabled"
 msgstr ""
 
-#: html/main.php:286
+#: html/main.php:289
 msgid "Plugin"
 msgstr ""
 
-#: html/main.php:287
+#: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
 msgstr ""
 
-#: html/main.php:302
+#: html/main.php:305
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:303
+#: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
@@ -3877,52 +3881,44 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr ""
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr ""
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:68
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4523,15 +4519,15 @@ msgid ""
 "'Off'."
 msgstr ""
 
-#: setup/class_setup.inc:127
+#: setup/class_setup.inc:122
 msgid "Setup error"
 msgstr ""
 
-#: setup/class_setup.inc:207
+#: setup/class_setup.inc:202
 msgid "Completed"
 msgstr ""
 
-#: setup/class_setup.inc:250
+#: setup/class_setup.inc:245
 msgid "Next"
 msgstr ""
 
@@ -4773,72 +4769,78 @@ msgstr ""
 msgid "Set"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
+#: ihtml/themes/default/recovery.tpl.c:8
+msgid "Lost password"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:11
-msgid "Lost password"
+msgid ""
+"Informations to reset password for %1 have been sent to email address %2"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:14
+msgid "Warning : this email is only valid for %1 minutes."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:17
 #: ihtml/themes/default/recovery.tpl.c:20
-#: ihtml/themes/default/recovery.tpl.c:62
-#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:32
 #: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:41
-#: ihtml/themes/default/recovery.tpl.c:74
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:44
-#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/recovery.tpl.c:53
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
+"=> Use your e-mail in the long format, e.g : John Doe => "
+"john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:71
-msgid "Mail"
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
diff --git a/locale/vi_VN/fusiondirectory.po b/locale/vi_VN/fusiondirectory.po
index 99c060c36d57c97c981414aeb7475e073398c4d0..2ef5e3e91696cfdf393bf96ca67d4e827fc86910 100644
--- a/locale/vi_VN/fusiondirectory.po
+++ b/locale/vi_VN/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-10 13:25+0200\n"
-"PO-Revision-Date: 2016-06-03 11:03+0000\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
+"PO-Revision-Date: 2016-06-25 10:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/vi_VN/)\n"
 "MIME-Version: 1.0\n"
@@ -144,7 +144,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_group.inc:73
 #: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:414
 msgid "GID"
 msgstr "Sá»‘ ID cá»§a nhÃ³m"
 
@@ -201,11 +201,10 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467 include/functions.inc:799
+#: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:520 html/class_passwordRecovery.inc:169
-#: setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -217,7 +216,7 @@ msgid "Warning"
 msgstr "Cáº£nh bÃ¡o"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr "Thá»i gian chá» khÃ³a. Bá» qua khÃ³a!"
 
@@ -562,7 +561,7 @@ msgstr "TÃªn tháºt"
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr "ÄÄƒng nháºp"
 
@@ -933,7 +932,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1151,8 +1150,8 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:654
-#: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:32
 msgid "New password"
 msgstr "Máºt kháº©u má»›i"
 
@@ -1337,11 +1336,11 @@ msgstr "máºt kháº©u háº¿t háº¡n"
 msgid "password not changeable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:408
+#: plugins/personal/posix/class_posixAccount.inc:411
 msgid "UID"
 msgstr "Sá»‘ ID cá»§a ngÆ°á»i sá» dá»¥ng"
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:530
 #, php-format
 msgid "Group of user %s"
 msgstr ""
@@ -1583,7 +1582,7 @@ msgid "Session lifetime"
 msgstr "Thá»i gian cho má»™t phiÃªn (má»™t Session)"
 
 #: plugins/config/class_configInLdap.inc:207
-msgid "Defines when a session will expire in seconds."
+msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:212
@@ -2164,7 +2163,7 @@ msgstr "Chá»n táº¥t"
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:790
-#: include/class_plugin.inc:1518 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1521 include/class_CopyPasteHandler.inc:276
 #: include/simpleplugin/class_attribute.inc:1571
 #: include/simpleplugin/class_attribute.inc:1574
 #: include/simpleplugin/class_attribute.inc:1577
@@ -2177,7 +2176,7 @@ msgstr "Chá»n táº¥t"
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:471 html/index.php:481
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2301,7 +2300,7 @@ msgstr "Lá»—i XML trong fusiondirectory.conf: %s táº¡i dÃ²ng %d"
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr "Lá»—i cáº¥u hÃ¬nh"
 
@@ -2323,7 +2322,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:367 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3415,7 +3414,7 @@ msgid ""
 "\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
 msgstr ""
 
-#: include/class_plugin.inc:1316
+#: include/class_plugin.inc:1319
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3525,39 +3524,39 @@ msgstr ""
 msgid "Unknown"
 msgstr "KhÃ´ng rÃµ"
 
-#: include/simpleplugin/class_helpersAttribute.inc:260
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:261
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:262
+#: include/simpleplugin/class_helpersAttribute.inc:266
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_helpersAttribute.inc:267
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:275
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:276
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:277
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr ""
 
@@ -3740,127 +3739,132 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr "ObjecType Ä‘Æ°á»£c chá»‰ Ä‘á»‹nh Ä‘ang rá»—ng háº·c khÃ´ng há»£p lá»‡!"
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
-msgstr "PhiÃªn khÃ´ng Ä‘Æ°á»£c mÃ£ hÃ³a!"
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
+msgstr ""
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
-msgstr "Thá»i gian háº¡n Ä‘á»‹nh cá»§a phiÃªn Ä‘Æ°á»£c cáº¥u hÃ¬nh trong file fusiondirectory.conf cá»§a báº¡n sáº½ Ä‘Æ°á»£c ghi Ä‘Ã¨ lÃªn bá»Ÿi cÃ¡c thiáº¿t láºp php.ini."
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
+msgstr ""
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:172
+#: html/index.php:171
 msgid "Smarty error"
 msgstr "Lá»—i Smarty"
 
-#: html/index.php:174
+#: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:209
+#: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:212
+#: html/index.php:211
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:214
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:218
+#: html/index.php:217
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:279
+#: html/index.php:278
 msgid "Please specify a valid username!"
 msgstr "Xin hÃ£y xÃ¡c Ä‘á»‹nh má»™t tÃªn ngÆ°á»i dÃ¹ng há»£p lá»‡!"
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify your password!"
 msgstr "Xin hÃ£y xÃ¡c Ä‘á»‹nh máºt mÃ£ cá»§a báº¡n!"
 
-#: html/index.php:301
+#: html/index.php:300
 msgid "Please check the username/password combination."
 msgstr "Xin hÃ£y kiá»ƒm tra káº¿t há»£p tÃªn ngÆ°á»i dÃ¹ng/máºt kháº©u."
 
-#: html/index.php:331
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr "TÃ i khoáº£n bá»‹ khÃ³a. Xin hÃ£y liÃªn láº¡c vá»›i admin quáº£n trá»‹ há»‡ thá»‘ng cá»§a báº¡n!"
 
-#: html/index.php:473
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:483
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:520
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr "TrÃ¬nh duyá»‡t cá»§a báº¡n Ä‘Ã£ vÃ´ hiá»‡u cookies. Xin hÃ£y cho phÃ©p cookies vÃ o vÃ  táº£i láº¡i trang nÃ y trÆ°á»›c khi Ä‘Äƒng nháºp!"
 
-#: html/main.php:113
+#: html/main.php:115
 msgid "PHP configuration"
 msgstr "Cáº¥u hÃ¬nh PHP"
 
-#: html/main.php:114
+#: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Password change"
 msgstr "Thay Ä‘á»•i máºt kháº©u"
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
 msgstr "Máºt kháº©u cá»§a báº¡n chuáº©n bá»‹ háº¿t háº¡n, xin hÃ£y thay Ä‘á»‘i máºt kháº©u cá»§a báº¡n!"
 
-#: html/main.php:205
+#: html/main.php:158
+msgid "Your password has expired, please set a new one."
+msgstr ""
+
+#: html/main.php:208
 msgid "Running out of memory!"
 msgstr "Háº¿t dung lÆ°á»£ng bá»™ nhá»›!"
 
-#: html/main.php:248
+#: html/main.php:251
 msgid "User ACL checks disabled"
 msgstr "VÃ´ hiá»‡u viá»‡c kiá»ƒm tra ACL cá»§a ngÆ°á»i dÃ¹ng"
 
-#: html/main.php:286
+#: html/main.php:289
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/main.php:287
+#: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
 msgstr ""
 
-#: html/main.php:302
+#: html/main.php:305
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:303
+#: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
@@ -3877,52 +3881,44 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "KhÃ´ng thá»ƒ truy cáºp vÃ o thÆ° má»¥c '%s' Ä‘Æ°á»£c xÃ¡c Ä‘á»‹nh lÃ  thÆ° má»¥c soáº¡n tháº£o!"
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr "PhiÃªn sáº½ khÃ´ng Ä‘Æ°á»£c mÃ£ hÃ³a."
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr "VÃ o phiÃªn SSL"
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:68
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4523,15 +4519,15 @@ msgid ""
 "'Off'."
 msgstr "TÃ¬m kiáº¿m 'zend.ze1_compatibility_mode' trong thÆ° má»¥c  php.ini vÃ  chuyá»ƒn nÃ³ thÃ nh 'Off'."
 
-#: setup/class_setup.inc:127
+#: setup/class_setup.inc:122
 msgid "Setup error"
 msgstr "Lá»—i cÃ i Ä‘áº·t"
 
-#: setup/class_setup.inc:207
+#: setup/class_setup.inc:202
 msgid "Completed"
 msgstr "ÄÃ£ hoÃ n thÃ nh"
 
-#: setup/class_setup.inc:250
+#: setup/class_setup.inc:245
 msgid "Next"
 msgstr "Tiáº¿p tá»¥c"
 
@@ -4773,72 +4769,78 @@ msgstr "Lá» lá»—i nÃ y Ä‘i vÃ  hiá»ƒn thá»‹ táº¥t cáº£ cÃ¡c entry mÃ  phÃ¹ há»£
 msgid "Set"
 msgstr "Äáº·t"
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
+#: ihtml/themes/default/recovery.tpl.c:8
+msgid "Lost password"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:11
-msgid "Lost password"
+msgid ""
+"Informations to reset password for %1 have been sent to email address %2"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:14
+msgid "Warning : this email is only valid for %1 minutes."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:17
 #: ihtml/themes/default/recovery.tpl.c:20
-#: ihtml/themes/default/recovery.tpl.c:62
-#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr "ThÆ° má»¥c"
 
-#: ihtml/themes/default/recovery.tpl.c:32
 #: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr "Máºt kháº©u má»›i Ä‘Æ°á»£c láº·p láº¡i"
 
-#: ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr "Æ¯u Ä‘iá»ƒm cá»§a máºt kháº©u"
 
-#: ihtml/themes/default/recovery.tpl.c:41
-#: ihtml/themes/default/recovery.tpl.c:74
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr "Thay Ä‘á»•i"
 
-#: ihtml/themes/default/recovery.tpl.c:44
-#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr "KÃch vÃ o Ä‘Ã¢y Ä‘á»ƒ thay Ä‘á»•i máºt kháº©u cá»§a báº¡n"
 
-#: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/recovery.tpl.c:53
 msgid "Success"
 msgstr "ThÃ nh cÃ´ng"
 
-#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr "Máºt kháº©u cá»§a báº¡n Ä‘Ã£ Ä‘Æ°á»£c thay Ä‘á»•i thÃ nh cÃ´ng."
 
-#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
+"=> Use your e-mail in the long format, e.g : John Doe => "
+"john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:71
-msgid "Mail"
-msgstr "ThÆ°"
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
+msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
diff --git a/locale/zh/fusiondirectory.po b/locale/zh/fusiondirectory.po
index 6ac30388139e95cb936755731ca8cfdc411630c9..d33163232acea9fd68731dbcc1d36bc011a1c61b 100644
--- a/locale/zh/fusiondirectory.po
+++ b/locale/zh/fusiondirectory.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FusionDirectory-110\n"
 "Report-Msgid-Bugs-To: bugs@fusiondirectory.org\n"
-"POT-Creation-Date: 2016-06-10 13:25+0200\n"
-"PO-Revision-Date: 2016-06-03 11:03+0000\n"
+"POT-Creation-Date: 2016-06-25 12:52+0200\n"
+"PO-Revision-Date: 2016-06-25 10:50+0000\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
 "Language-Team: Chinese (http://www.transifex.com/fusiondirectory/FusionDirectory-110/language/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -144,7 +144,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_group.inc:73
 #: plugins/admin/groups/class_group.inc:149
-#: plugins/personal/posix/class_posixAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:414
 msgid "GID"
 msgstr "GID"
 
@@ -201,11 +201,10 @@ msgid "Only allow this group to connect to this list of hosts"
 msgstr ""
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467 include/functions.inc:799
+#: plugins/personal/posix/class_posixAccount.inc:470 include/functions.inc:799
 #: include/functions.inc:2554 include/class_xml.inc:55
-#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:56
-#: html/index.php:62 html/index.php:520 html/class_passwordRecovery.inc:169
-#: setup/class_setupStep_Migrate.inc:572
+#: include/simpleplugin/class_simpleTabs.inc:319 html/index.php:519
+#: html/main.php:158 setup/class_setupStep_Migrate.inc:572
 #: setup/class_setupStep_Migrate.inc:1083
 #: setup/class_setupStep_Migrate.inc:1202
 #: setup/class_setupStep_Migrate.inc:1313
@@ -217,7 +216,7 @@ msgid "Warning"
 msgstr "è¦å‘Š"
 
 #: plugins/admin/groups/class_group.inc:181
-#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/posix/class_posixAccount.inc:470
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
@@ -562,7 +561,7 @@ msgstr "å"
 #: plugins/personal/generic/class_user.inc:377
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:26
 msgid "Login"
 msgstr "ç™»å½•å"
 
@@ -933,7 +932,7 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:51
 #: plugins/personal/generic/class_user.inc:386
 #: plugins/personal/generic/paste_generic.tpl.c:14
-#: ihtml/themes/default/recovery.tpl.c:5 ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/recovery.tpl.c:2 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23
 #: setup/setup_migrate_adminAccount.tpl.c:14
@@ -1151,8 +1150,8 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/generic/class_user.inc:654
-#: ihtml/themes/default/recovery.tpl.c:26
 #: ihtml/themes/default/recovery.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:32
 msgid "New password"
 msgstr "æ–°å£ä»¤"
 
@@ -1337,11 +1336,11 @@ msgstr ""
 msgid "password not changeable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:408
+#: plugins/personal/posix/class_posixAccount.inc:411
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:530
 #, php-format
 msgid "Group of user %s"
 msgstr ""
@@ -1583,7 +1582,7 @@ msgid "Session lifetime"
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:207
-msgid "Defines when a session will expire in seconds."
+msgid "Defines when a session will expire in seconds (0 to disable)."
 msgstr ""
 
 #: plugins/config/class_configInLdap.inc:212
@@ -2164,7 +2163,7 @@ msgstr ""
 #: include/functions.inc:3196 include/functions.inc:3205
 #: include/functions.inc:3267 include/class_msg_dialog.inc:128
 #: include/class_xml.inc:58 include/class_plugin.inc:790
-#: include/class_plugin.inc:1518 include/class_CopyPasteHandler.inc:276
+#: include/class_plugin.inc:1521 include/class_CopyPasteHandler.inc:276
 #: include/simpleplugin/class_attribute.inc:1571
 #: include/simpleplugin/class_attribute.inc:1574
 #: include/simpleplugin/class_attribute.inc:1577
@@ -2177,7 +2176,7 @@ msgstr ""
 #: include/password-methods/class_password-methods-sasl.inc:85
 #: include/password-methods/class_password-methods.inc:428
 #: include/password-methods/class_password-methods.inc:438
-#: include/class_SnapshotHandler.inc:422 html/index.php:471 html/index.php:481
+#: include/class_SnapshotHandler.inc:422 html/index.php:470 html/index.php:480
 #: setup/class_setupStep_Migrate.inc:935
 #: ihtml/themes/default/msg_dialog.tpl.c:2 setup/setup_checks.tpl.c:5
 msgid "Error"
@@ -2301,7 +2300,7 @@ msgstr "XML å‡ºé”™äºŽ fusiondirectory.conf: %s ï¼Œè¡Œ %d"
 #: include/password-methods/class_password-methods-sha.inc:69
 #: include/password-methods/class_password-methods-ssha.inc:73
 #: include/password-methods/class_password-methods-ssha.inc:89
-#: html/index.php:149 html/main.php:205 html/class_passwordRecovery.inc:131
+#: html/index.php:148 html/main.php:208 html/class_passwordRecovery.inc:131
 msgid "Configuration error"
 msgstr ""
 
@@ -2323,7 +2322,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:48 include/class_SnapshotHandler.inc:247
 #: include/class_SnapshotHandler.inc:280 include/class_SnapshotHandler.inc:296
 #: include/class_SnapshotHandler.inc:429 include/class_SnapshotHandler.inc:432
-#: html/index.php:367 html/class_passwordRecovery.inc:520
+#: html/index.php:366 html/class_passwordRecovery.inc:517
 #: setup/class_setupStep_Migrate.inc:451
 #: setup/class_setupStep_Migrate.inc:1130
 msgid "LDAP error"
@@ -3415,7 +3414,7 @@ msgid ""
 "\"%2$s\" as \"%2$s\" already depends on \"%1$s\""
 msgstr ""
 
-#: include/class_plugin.inc:1316
+#: include/class_plugin.inc:1319
 #, php-format
 msgid "Tab \"%s\""
 msgstr ""
@@ -3525,39 +3524,39 @@ msgstr ""
 msgid "Unknown"
 msgstr "æœªçŸ¥"
 
-#: include/simpleplugin/class_helpersAttribute.inc:260
+#: include/simpleplugin/class_helpersAttribute.inc:264
 msgid "B"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:261
+#: include/simpleplugin/class_helpersAttribute.inc:265
 msgid "KiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:262
+#: include/simpleplugin/class_helpersAttribute.inc:266
 msgid "MiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:263
+#: include/simpleplugin/class_helpersAttribute.inc:267
 msgid "GiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:264
+#: include/simpleplugin/class_helpersAttribute.inc:268
 msgid "TiB"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:275
+#: include/simpleplugin/class_helpersAttribute.inc:279
 msgid "seconds"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:276
+#: include/simpleplugin/class_helpersAttribute.inc:280
 msgid "minutes"
 msgstr ""
 
-#: include/simpleplugin/class_helpersAttribute.inc:277
+#: include/simpleplugin/class_helpersAttribute.inc:281
 msgid "hours"
 msgstr "å°æ—¶"
 
-#: include/simpleplugin/class_helpersAttribute.inc:278
+#: include/simpleplugin/class_helpersAttribute.inc:282
 msgid "days"
 msgstr "å¤©"
 
@@ -3740,127 +3739,132 @@ msgstr ""
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: html/index.php:56
-msgid "Session is not encrypted!"
+#: html/index.php:56 html/class_passwordRecovery.inc:169
+#, php-format
+msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:63
+#: html/index.php:62
 msgid ""
-"The session lifetime configured in your fusiondirectory.conf will be "
-"overridden by php.ini settings."
+"Warning: The session lifetime configured in your fusiondirectory.conf will "
+"be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:151
+#: html/index.php:150
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:172
+#: html/index.php:171
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:174
+#: html/index.php:173
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:209
+#: html/index.php:208
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:212
+#: html/index.php:211
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:215
+#: html/index.php:214
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:218
+#: html/index.php:217
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:279
+#: html/index.php:278
 msgid "Please specify a valid username!"
 msgstr "è¯·è¾“å…¥ä¸€ä¸ªæœ‰æ•ˆçš„ç”¨æˆ·åï¼"
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify your password!"
 msgstr "è¯·è¾“å…¥æ‚¨çš„å£ä»¤ï¼"
 
-#: html/index.php:301
+#: html/index.php:300
 msgid "Please check the username/password combination."
 msgstr "è¯·æ£€æŸ¥ç”¨æˆ·å/å£ä»¤ã€‚"
 
-#: html/index.php:331
+#: html/index.php:330
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:473
+#: html/index.php:472
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:483
+#: html/index.php:482
 #, php-format
 msgid "CAS user \"%s\" match several users in the LDAP"
 msgstr ""
 
-#: html/index.php:520
+#: html/index.php:519
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr "æ‚¨çš„æµè§ˆå™¨å·²ç»ç¦ç”¨ cookiesã€‚è¯·å¯ç”¨ cookies å¹¶åœ¨ç™»å½•å‰é‡æ–°åŠ è½½æœ¬é¡µé¢ï¼"
 
-#: html/main.php:113
+#: html/main.php:115
 msgid "PHP configuration"
 msgstr ""
 
-#: html/main.php:114
+#: html/main.php:116
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Password change"
 msgstr ""
 
-#: html/main.php:140
+#: html/main.php:142
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:205
+#: html/main.php:158
+msgid "Your password has expired, please set a new one."
+msgstr ""
+
+#: html/main.php:208
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:248
+#: html/main.php:251
 msgid "User ACL checks disabled"
 msgstr ""
 
-#: html/main.php:286
+#: html/main.php:289
 msgid "Plugin"
 msgstr ""
 
-#: html/main.php:287
+#: html/main.php:290
 #, php-format
 msgid ""
 "Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
 " a file)!"
 msgstr ""
 
-#: html/main.php:302
+#: html/main.php:305
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:303
+#: html/main.php:306
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
@@ -3877,52 +3881,44 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "ç›®å½• '%s' ä½œä¸ºç¼–è¯‘ç›®å½•æ— æ³•è®¿é—®ï¼"
 
-#: html/class_passwordRecovery.inc:170
-msgid "Session will not be encrypted."
-msgstr "ä¼šè¯ä¸ä¼šè¢«åŠ å¯†ã€‚"
-
-#: html/class_passwordRecovery.inc:172
-msgid "Enter SSL session"
-msgstr "è¿›å…¥ SSL ä¼šè¯"
-
-#: html/class_passwordRecovery.inc:444
+#: html/class_passwordRecovery.inc:441
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:447
+#: html/class_passwordRecovery.inc:444
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:461 ihtml/themes/default/recovery.tpl.c:68
+#: html/class_passwordRecovery.inc:458 ihtml/themes/default/recovery.tpl.c:71
 msgid "Email address"
 msgstr "é‚®ä»¶åœ°å€"
 
-#: html/class_passwordRecovery.inc:484
+#: html/class_passwordRecovery.inc:481
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:487
+#: html/class_passwordRecovery.inc:484
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:495
+#: html/class_passwordRecovery.inc:492
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:543
+#: html/class_passwordRecovery.inc:540
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:554
+#: html/class_passwordRecovery.inc:551
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:614
+#: html/class_passwordRecovery.inc:611
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -4523,15 +4519,15 @@ msgid ""
 "'Off'."
 msgstr ""
 
-#: setup/class_setup.inc:127
+#: setup/class_setup.inc:122
 msgid "Setup error"
 msgstr ""
 
-#: setup/class_setup.inc:207
+#: setup/class_setup.inc:202
 msgid "Completed"
 msgstr ""
 
-#: setup/class_setup.inc:250
+#: setup/class_setup.inc:245
 msgid "Next"
 msgstr ""
 
@@ -4773,72 +4769,78 @@ msgstr "å¿½ç•¥é”™è¯¯å¹¶æ˜¾ç¤ºåœ¨å®šä¹‰é™åˆ¶é•¿åº¦å†…çš„æ‰€æœ‰æ¡ç›®ï¼Œå¹¶è®©æˆ‘
 msgid "Set"
 msgstr "è®¾ç½®"
 
-#: ihtml/themes/default/recovery.tpl.c:2
-msgid "FusionDirectory password recovery"
+#: ihtml/themes/default/recovery.tpl.c:8
+msgid "Lost password"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:11
-msgid "Lost password"
+msgid ""
+"Informations to reset password for %1 have been sent to email address %2"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:14
+msgid "Warning : this email is only valid for %1 minutes."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:17
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:17
 #: ihtml/themes/default/recovery.tpl.c:20
-#: ihtml/themes/default/recovery.tpl.c:62
-#: ihtml/themes/default/recovery.tpl.c:65 ihtml/themes/default/login.tpl.c:29
+#: ihtml/themes/default/recovery.tpl.c:23
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/recovery.tpl.c:68 ihtml/themes/default/login.tpl.c:29
 #: ihtml/themes/default/login.tpl.c:32 ihtml/themes/default/login.tpl.c:35
 msgid "Directory"
 msgstr "ç›®å½•"
 
-#: ihtml/themes/default/recovery.tpl.c:32
 #: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:38
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/recovery.tpl.c:41
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:41
-#: ihtml/themes/default/recovery.tpl.c:74
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/recovery.tpl.c:77
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:44
-#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:80
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/recovery.tpl.c:53
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/recovery.tpl.c:56
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:59
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:62
 msgid ""
-"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
+"=> Use your e-mail in the long format, e.g : John Doe => "
+"john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/default/recovery.tpl.c:71
-msgid "Mail"
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid "Email"
 msgstr "é‚®ä»¶"
 
-#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/recovery.tpl.c:83
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"