diff --git a/locale/ar/fusiondirectory.po b/locale/ar/fusiondirectory.po
index df3f3602fb94112c84b8568e6bf2a25c4e648489..a3b2d63ea59fb2ef957e7f7c34e9d5a50c87453c 100644
--- a/locale/ar/fusiondirectory.po
+++ b/locale/ar/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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/fusiondirectory/teams/12202/ar/)\n"
@@ -174,7 +174,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr "تحذير"
@@ -533,7 +533,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -749,8 +749,8 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "خطأ"
@@ -843,7 +843,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
 
@@ -889,7 +889,7 @@ msgstr ""
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr ""
 
@@ -897,7 +897,7 @@ msgstr ""
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
@@ -2100,7 +2100,7 @@ msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr ""
@@ -2335,95 +2335,95 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:173
+#: html/index.php:172
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:217
+#: html/index.php:216
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:304
+#: html/index.php:303
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:337
+#: html/index.php:336
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:537
+#: html/index.php:536
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2434,44 +2434,45 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:474
+#: html/class_passwordRecovery.inc:475
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:507
+#: html/class_passwordRecovery.inc:508
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:519
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:573
+#: html/class_passwordRecovery.inc:574
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2860,6 +2861,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr ""
 
@@ -2903,7 +2905,7 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr ""
 
@@ -3985,45 +3987,49 @@ msgid "Show application groups"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr ""
 
@@ -4495,69 +4501,75 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
 "administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr ""
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr ""
@@ -4665,12 +4677,14 @@ msgstr ""
 msgid "Read only"
 msgstr ""
 
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
 msgstr ""
 
 #: plugins/generic/references/contents.tpl.c:2
diff --git a/locale/ca/fusiondirectory.po b/locale/ca/fusiondirectory.po
index 53cd7fb3fad7494717f673e2fb5fdcdf741089e2..25fa77967b3e6f30de42eed68658345644ad027b 100644
--- a/locale/ca/fusiondirectory.po
+++ b/locale/ca/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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/fusiondirectory/teams/12202/ca/)\n"
@@ -174,7 +174,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr "Avís"
@@ -533,7 +533,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -749,8 +749,8 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Error"
@@ -843,7 +843,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Error de la configuració"
 
@@ -889,7 +889,7 @@ msgstr ""
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr "Entrada"
 
@@ -897,7 +897,7 @@ msgstr "Entrada"
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
@@ -2102,7 +2102,7 @@ msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr ""
@@ -2337,95 +2337,95 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:173
+#: html/index.php:172
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr "La vostra sessió del FusionDirectori ha caducat!"
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:217
+#: html/index.php:216
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify a valid username!"
 msgstr "Especifiqueu un nom d'usuari vàlid."
 
-#: html/index.php:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr "Especifiqueu la vostra contrasenya."
 
-#: html/index.php:304
+#: html/index.php:303
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:337
+#: html/index.php:336
 msgid "Account locked. Please contact your system administrator!"
 msgstr "El compte és blocat. Contacteu el vostre administrador de sistemes."
 
-#: html/index.php:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:537
+#: html/index.php:536
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2439,44 +2439,45 @@ msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 "La configuració %s/%s del FusionDirectori no és llegible. S'està avortant."
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:474
+#: html/class_passwordRecovery.inc:475
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:507
+#: html/class_passwordRecovery.inc:508
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:519
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:573
+#: html/class_passwordRecovery.inc:574
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2865,6 +2866,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr "Contrasenya nova"
 
@@ -2908,7 +2910,7 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr ""
 
@@ -3990,45 +3992,49 @@ msgid "Show application groups"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr ""
 
@@ -4500,69 +4506,75 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Directori"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Nom d'usuari"
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr "Contrasenya nova repetida"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr "Qualitat de la contrasenya"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Directori"
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr "Canvia"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 msgid "Click here to change your password"
 msgstr "Feu clic aquí per canviar la vostra contrasenya"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr "Èxit"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Your password has been changed successfully."
 msgstr "S'ha canviat la vostra contrasenya amb èxit."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr "Pantalla d'entrada"
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
 "administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Nom d'usuari"
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr ""
@@ -4670,12 +4682,14 @@ msgstr ""
 msgid "Read only"
 msgstr "Només lectura"
 
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
 msgstr ""
 
 #: plugins/generic/references/contents.tpl.c:2
diff --git a/locale/cs_CZ/fusiondirectory.po b/locale/cs_CZ/fusiondirectory.po
index 244c123498154b8f5b87fe74d4760b7f778a08f4..2653deccc20a3f64780795549ac266a5df7f7da3 100644
--- a/locale/cs_CZ/fusiondirectory.po
+++ b/locale/cs_CZ/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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2017\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/fusiondirectory/teams/12202/cs_CZ/)\n"
@@ -183,7 +183,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr "varování"
@@ -598,7 +598,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -818,8 +818,8 @@ msgstr "vybrat vše"
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "chyba"
@@ -914,7 +914,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "chyba v nastavení"
 
@@ -962,7 +962,7 @@ msgstr "nemohu vložit"
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr "uživatelské jméno"
 
@@ -970,7 +970,7 @@ msgstr "uživatelské jméno"
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "šablona"
@@ -2215,7 +2215,7 @@ msgstr "%s šablona"
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr "Zobrazit %s"
@@ -2456,18 +2456,18 @@ msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 "Adresář  '%s', nastavený jako místo pro provedení kompilace, není přístupný!"
 
-#: html/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
@@ -2476,79 +2476,79 @@ msgstr ""
 "Nastavení FusionDirectory %s/%s není čitelné. Pro nápravu spusťte (na "
 "serveru) příkaz fusiondirectory-setup --check-config ."
 
-#: html/index.php:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr "chyba ve Smarty"
 
-#: html/index.php:173
+#: html/index.php:172
 #, 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:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 "Vaše relace ve FusionDirectory byla automaticky ukončena po Vaší delší "
 "neaktivitÄ›!"
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr "Vaše IP adresa byla změněna!"
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr "Neplatný parametr %s pro zásuvný modul!"
 
-#: html/index.php:217
+#: html/index.php:216
 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:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify a valid username!"
 msgstr "Zadejte prosím platné uživatelské jméno!"
 
-#: html/index.php:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr "Zadejte prosím své heslo!"
 
-#: html/index.php:304
+#: html/index.php:303
 msgid "Please check the username/password combination."
 msgstr "Zkontrolujte prosím správnost zadaného uživatelského jména a hesla."
 
-#: html/index.php:337
+#: html/index.php:336
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Účet je uzamčen. Prosím kontaktujte svého správce systémů."
 
-#: html/index.php:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:537
+#: html/index.php:536
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2561,46 +2561,47 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "Nastavení %s/%s FusionDirectory není čitelné. Akce byla zrušena."
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr "e-mailová adresa"
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, 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:474
+#: html/class_passwordRecovery.inc:475
 #, 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:507
+#: html/class_passwordRecovery.inc:508
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:519
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:573
+#: html/class_passwordRecovery.inc:574
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 "Nastal problém s poštovním serverem – obraťte se prosím na svého správce "
 "systémů."
 
-#: html/class_passwordRecovery.inc:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr "tato poukázka (token) je neplatná"
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 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 "
@@ -3001,6 +3002,7 @@ msgstr "Zadání v kolonkách Nové heslo a Zopakování nového hesla se neshod
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr "nové heslo"
 
@@ -3046,7 +3048,7 @@ msgid "Expiration date"
 msgstr "Datum vypršení platnosti"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr "E-mail"
 
@@ -4173,45 +4175,49 @@ msgid "Show application groups"
 msgstr "Zobrazit skupiny aplikací"
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr "zobrazovat primární skupiny"
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "zobrazovat e-mailové skupiny"
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "zobrazovat skupiny Samby"
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr "Zobrazit skupiny serverů"
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr "Zobrazit skupiny počítačů"
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr "Zobrazit skupiny terminálů"
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr "Zobrazit skupiny tiskáren"
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr "Zobrazit skupiny telefonů"
 
@@ -4712,50 +4718,65 @@ msgstr ""
 "heslo do políček níže a klikněte na 'změnit'."
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "adresář"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "uživatelské jméno"
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr "nové heslo znovu"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr "odolnost hesla"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "adresář"
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr "změnit"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 msgid "Click here to change your password"
 msgstr "pro změnu hesla klikněte sem"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr "úspěch"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Your password has been changed successfully."
 msgstr "Vaše heslo bylo úspěšně změněno."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 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/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
@@ -4763,10 +4784,6 @@ msgstr ""
 "Funkce pro obnovení zapomenutého hesla není zapnutá. Pokud jste ztratili své"
 " heslo, kontaktujte svého správce systémů"
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr "přihlašovací obrazovka"
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
@@ -4775,11 +4792,6 @@ msgstr ""
 "Zadejte prosím své uživatelské jméno a heslo pro přihlášení do správy "
 "systémů tohoto místa."
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "uživatelské jméno"
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr "Mé heslo bylo zapomenuto"
@@ -4904,14 +4916,16 @@ msgstr ""
 msgid "Read only"
 msgstr "pouze pro čtení"
 
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+
 #: ihtml/themes/breezy/template.tpl.c:2
 msgid "Creating a new object using templates"
 msgstr "Vytváření nového objektu s použitím šablon"
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr "tým tvůrců FusionDirectory"
-
 #: plugins/generic/references/contents.tpl.c:2
 msgid "<strong>%1</strong> references our <strong>%3</strong>"
 msgstr "<strong>%1</strong> odkazuje na naši <strong>%3</strong>"
diff --git a/locale/de/fusiondirectory.po b/locale/de/fusiondirectory.po
index 027563d0d74cbaeada488725612d55d2b1ac5823..5a5bbf2daaeb1661b733beb9622349bd2c1021c2 100644
--- a/locale/de/fusiondirectory.po
+++ b/locale/de/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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Ettore Atalan <atalanttore@googlemail.com>, 2017\n"
 "Language-Team: German (https://www.transifex.com/fusiondirectory/teams/12202/de/)\n"
@@ -176,7 +176,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr "Warnung"
@@ -588,7 +588,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -808,8 +808,8 @@ msgstr "Alle auswählen"
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Fehler"
@@ -902,7 +902,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Konfigurationsfehler"
 
@@ -950,7 +950,7 @@ msgstr "Kann nicht einfügen"
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr "Kennung"
 
@@ -958,7 +958,7 @@ msgstr "Kennung"
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Vorlage"
@@ -2199,7 +2199,7 @@ msgstr "%s Vorlage"
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr "Zeigen %s"
@@ -2436,18 +2436,18 @@ msgstr ""
 "Auf das als Compile-Verzeichnis angegegebene Verzeichnis '%s' kann nicht "
 "zugegriffen werden!"
 
-#: html/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
@@ -2456,77 +2456,77 @@ msgstr ""
 "FusionDirectory Konfiguration %s/%s ist nicht lesbar. Bitte starten Sie "
 "fusiondirectory-setup --check-config um dies zu beheben."
 
-#: html/index.php:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr "Smarty-Fehler"
 
-#: html/index.php:173
+#: html/index.php:172
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr "Ihre FusionDirectory Sitzung ist abgelaufen!"
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr "Ihre IP hat sich geändert!"
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:217
+#: html/index.php:216
 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:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify a valid username!"
 msgstr "Bitte geben Sie einen gültigen Benutzernamen ein!"
 
-#: html/index.php:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr "Bitte geben Sie Ihr Passwort ein!"
 
-#: html/index.php:304
+#: html/index.php:303
 msgid "Please check the username/password combination."
 msgstr "Bitte überprüfen Sie die Kombination von Benutzernamen und Passwort."
 
-#: html/index.php:337
+#: html/index.php:336
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Das Konto ist gesperrt. Bitte benachrichtigen Sie den Administrator!"
 
-#: html/index.php:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:537
+#: html/index.php:536
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2539,45 +2539,46 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "FusionDirectory Konfiguration %s/%s ist nicht lesbar. Abgebrochen."
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr "Email-Adresse"
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:474
+#: html/class_passwordRecovery.inc:475
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:507
+#: html/class_passwordRecovery.inc:508
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:519
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:573
+#: html/class_passwordRecovery.inc:574
 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:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr "Das Token ist nicht gültig"
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 "Es gab ein Problem mit dem Mailserver, Bestätigungsmail wurde nicht "
@@ -2974,6 +2975,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr "Neues Passwort"
 
@@ -3018,7 +3020,7 @@ msgid "Expiration date"
 msgstr "Ablaufdatum"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr "Email"
 
@@ -4140,45 +4142,49 @@ msgid "Show application groups"
 msgstr "Anwendungsgruppen anzeigen"
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr "Zeige primäre Gruppen"
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Zeige Mail Gruppen"
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Zeige Samba Gruppen"
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr "DSA-Einträge anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr "Servergruppen anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr "Gruppen von Arbeitsstationen anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr "Gruppen von Terminals anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr "Druckergruppen anzeigen"
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr "Telefongruppen anzeigen"
 
@@ -4668,37 +4674,52 @@ msgstr ""
 "klicken Sie auf die Schaltfläche 'Ändern'."
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Verzeichnis"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Benutzername"
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr "Neues Passwort (Wiederholung)"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr "Passwort-Stärke"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Verzeichnis"
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr "Ändern"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 msgid "Click here to change your password"
 msgstr "Hier klicken, um Ihr Passwort zu ändern"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr "Erfolg"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Your password has been changed successfully."
 msgstr "Ihr Passwort wurde erfolgreich geändert."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
@@ -4706,13 +4727,13 @@ msgstr ""
 "Geben Sie Ihre aktuelle Email-Adresse ins unten genannte Feld ein und "
 "klicken Sie die 'Ändern'-Schaltfläche."
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
@@ -4720,10 +4741,6 @@ msgstr ""
 "Passwort-Wiederherstellung ist nicht aktiviert. Wenn Sie Ihr Passwort "
 "verloren haben, kontaktieren Sie bitte Ihren Administrator"
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr "Anmeldefenster"
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
@@ -4732,11 +4749,6 @@ msgstr ""
 "Nutzen Sie Ihren Benutzernamen und Ihr Passwort, um sich an der Verwaltung "
 "des Standorts anzumelden."
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Benutzername"
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr "Ich habe mein Passwort vergessen"
@@ -4856,14 +4868,16 @@ msgstr ""
 msgid "Read only"
 msgstr "Nur Lesen"
 
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+
 #: ihtml/themes/breezy/template.tpl.c:2
 msgid "Creating a new object using templates"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr "Das FusionDirectory Team"
-
 #: plugins/generic/references/contents.tpl.c:2
 msgid "<strong>%1</strong> references our <strong>%3</strong>"
 msgstr ""
diff --git a/locale/el_GR/fusiondirectory.po b/locale/el_GR/fusiondirectory.po
index d15f45eb67758970a31e7c23139ce558b914c6d3..62dbae8f3257341b9cd392473f2ca13541b0a3d8 100644
--- a/locale/el_GR/fusiondirectory.po
+++ b/locale/el_GR/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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Greek (Greece) (https://www.transifex.com/fusiondirectory/teams/12202/el_GR/)\n"
@@ -174,7 +174,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr "Προειδοποίηση"
@@ -533,7 +533,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -749,8 +749,8 @@ msgstr "Επιλογή όλων"
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Σφάλμα"
@@ -843,7 +843,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Σφάλμα ρύθμισης"
 
@@ -889,7 +889,7 @@ msgstr "Αδυναμία επικόλλησης"
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr "Σύνδεση"
 
@@ -897,7 +897,7 @@ msgstr "Σύνδεση"
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Πρότυπο"
@@ -2111,7 +2111,7 @@ msgstr "πρότυπο %s"
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr "Εμφάνιση %s"
@@ -2346,95 +2346,95 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:173
+#: html/index.php:172
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:217
+#: html/index.php:216
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify a valid username!"
 msgstr "Παρακαλώ καθορίστε ένα έγκυρο όνομα χρήστη!"
 
-#: html/index.php:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:304
+#: html/index.php:303
 msgid "Please check the username/password combination."
 msgstr "Παρακαλώ ελέγξτε το συνδυασμό όνομα χρήστη/κωδικός πρόσβασης."
 
-#: html/index.php:337
+#: html/index.php:336
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:537
+#: html/index.php:536
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2446,44 +2446,45 @@ msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 "Οι ρυθμίσεις %s/%s  του FusionDirectory δεν είναι αναγνώσιμες. Εγκατάλειψη"
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr "Διευθύνση ηλεκτρονικής αλληλογγραφίας"
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:474
+#: html/class_passwordRecovery.inc:475
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:507
+#: html/class_passwordRecovery.inc:508
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:519
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:573
+#: html/class_passwordRecovery.inc:574
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2878,6 +2879,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr "Νέος κωδικός "
 
@@ -2921,7 +2923,7 @@ msgid "Expiration date"
 msgstr "Ημερομηνία λήξης"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr "Ηλ. διεύθυνση"
 
@@ -4022,45 +4024,49 @@ msgid "Show application groups"
 msgstr "Εμφάνιση ομάδων εφαρμογών"
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr "Εμφάνιση αρχικών ομάδων"
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Εμφάνιση ομάδων αλληλογραφίας"
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Εμφάνιση ομάδων samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr "Εμφάνιση ομάδων server"
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr "Εμφάνιση ομάδων σταθμών εργασίας"
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr "Εμφάνιση ομάδων τερματικού"
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr "Εμφάνιση ομάδων εκτυπωτή"
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr "Εμφάνιση ομάδων τηλεφώνου"
 
@@ -4537,58 +4543,69 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Κατάλογος"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Όνομα χρήστη"
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr "Επανάληψη νέου κωδικού"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr "Ισχύς κωδικού"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Κατάλογος"
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr "Αλλαγή"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 msgid "Click here to change your password"
 msgstr "Κάντε κλικ εδώ για να αλλάξετε τον κωδικό σας"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr "Επιτυχία"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Your password has been changed successfully."
 msgstr "Ο κωδικός σας άλλαξε με επιτυχία"
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr "Οθόνη σύνδεσης"
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
@@ -4597,11 +4614,6 @@ msgstr ""
 "Εισαγωγή ονόματος χρήστη και κωδικού πρόσβασης για σύνδεση στο σύστημα "
 "διαχείρισης σελίδας"
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Όνομα χρήστη"
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr "Ξεχάσατε τον κωδικό σας;"
@@ -4711,12 +4723,14 @@ msgstr ""
 msgid "Read only"
 msgstr "Μόνο για ανάγνωση"
 
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
 msgstr ""
 
 #: plugins/generic/references/contents.tpl.c:2
diff --git a/locale/en/fusiondirectory.po b/locale/en/fusiondirectory.po
index e7279669f3bc6c654d4a1cbd91c2de42e3642dbc..8e3c313ec80aa22c3c170b4bf35e19205fb93aa5 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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-08-02 11:48+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FusionDirectory project <contact@fusiondirectory.org>\n"
 "Language-Team: English\n"
@@ -897,7 +897,7 @@ msgstr ""
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
@@ -2099,7 +2099,7 @@ msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr ""
@@ -3985,45 +3985,49 @@ msgid "Show application groups"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr ""
 
diff --git a/locale/es/fusiondirectory.po b/locale/es/fusiondirectory.po
index b143a3a4c840a5e627c08ce243d635e73912e527..92dc5d2e7eda59181a290b776b71e115ba39508e 100644
--- a/locale/es/fusiondirectory.po
+++ b/locale/es/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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/fusiondirectory/teams/12202/es/)\n"
@@ -176,7 +176,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr "Aviso"
@@ -565,7 +565,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -784,8 +784,8 @@ msgstr "Seleccione todos"
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Error"
@@ -878,7 +878,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Error en la configuración"
 
@@ -925,7 +925,7 @@ msgstr "No puedo pegar"
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr "Inicio"
 
@@ -933,7 +933,7 @@ msgstr "Inicio"
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Plantilla"
@@ -2169,7 +2169,7 @@ msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr ""
@@ -2404,96 +2404,96 @@ msgstr "Smarty"
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "¡No se puede acceder a el directorio de compilación '%s'!"
 
-#: html/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr "Error Smarty"
 
-#: html/index.php:173
+#: html/index.php:172
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr "Su sesión de FusionDirectory ha expirado!"
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:217
+#: html/index.php:216
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify a valid username!"
 msgstr "¡Por favor introduzca un nombre de usuario válido!"
 
-#: html/index.php:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr "¡Por favor introduzca una contraseña!"
 
-#: html/index.php:304
+#: html/index.php:303
 msgid "Please check the username/password combination."
 msgstr "Por favor compruebe la combinación nombre de usuario/contraseña"
 
-#: html/index.php:337
+#: html/index.php:336
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 "Cuenta bloqueada. ¡Por favor contacte con su administrador de sistemas!"
 
-#: html/index.php:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:537
+#: html/index.php:536
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2507,45 +2507,46 @@ msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 "La configuración de FusionDirectory %s/%s no se puede leer. Cancelado."
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr "Dirección de correo"
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:474
+#: html/class_passwordRecovery.inc:475
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:507
+#: html/class_passwordRecovery.inc:508
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:519
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:573
+#: html/class_passwordRecovery.inc:574
 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:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr "Esta prenda es invalida"
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2939,6 +2940,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr "Nueva contraseña"
 
@@ -2983,7 +2985,7 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr "Correo Electrónico"
 
@@ -4069,45 +4071,49 @@ msgid "Show application groups"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr "Mostrar grupos primarios"
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Mostrar grupos de correo"
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Mostrar grupos de samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr ""
 
@@ -4594,37 +4600,52 @@ msgstr ""
 "clave nueva (dos veces) en los campos debajo y presione el botón 'Cambiar'."
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Directorio"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Nombre de Usuario"
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr "Repita la nueva contraseña"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr "Resistencia de la contraseña"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Directorio"
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr "Cambiar"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 msgid "Click here to change your password"
 msgstr "Pulse aquí para cambiar su contraseña"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr "Correcto"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Your password has been changed successfully."
 msgstr "Su contraseña se ha cambiado correctamente."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
@@ -4632,22 +4653,18 @@ msgstr ""
 "Introduzca su dirección de correo actual en el campo debajo y presione el "
 "botón 'Cambiar'"
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr "Pantalla de inicio"
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
@@ -4656,11 +4673,6 @@ msgstr ""
 "Por favor use su nombre de usuario y contraseña para iniciar sesión en el "
 "sistema de administración."
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Nombre de Usuario"
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr ""
@@ -4781,14 +4793,16 @@ msgstr ""
 msgid "Read only"
 msgstr "Solo lectura"
 
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+
 #: ihtml/themes/breezy/template.tpl.c:2
 msgid "Creating a new object using templates"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr "El equipo de FusionDirectory"
-
 #: plugins/generic/references/contents.tpl.c:2
 msgid "<strong>%1</strong> references our <strong>%3</strong>"
 msgstr ""
diff --git a/locale/es_CO/fusiondirectory.po b/locale/es_CO/fusiondirectory.po
index 24b4e529a8a8c016719e5a7dfebbb2c5e2d36ab4..9e9a5bd11daabe7d298a2aa0fa4e95d1f3dc615f 100644
--- a/locale/es_CO/fusiondirectory.po
+++ b/locale/es_CO/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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/fusiondirectory/teams/12202/es_CO/)\n"
@@ -184,7 +184,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr "Precacuión"
@@ -592,7 +592,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -815,8 +815,8 @@ msgstr "Seleccionar todo"
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Error"
@@ -911,7 +911,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Error de configuración"
 
@@ -957,7 +957,7 @@ msgstr "No se puede pegar"
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr "Usuario"
 
@@ -965,7 +965,7 @@ msgstr "Usuario"
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Plantilla"
@@ -2200,7 +2200,7 @@ msgstr "%s plantilla"
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr "Mostrar %s"
@@ -2439,18 +2439,18 @@ msgstr "Smarty"
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "¡No se puede acceder al directorio '%s' especificado para compilar!"
 
-#: html/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
@@ -2460,77 +2460,77 @@ msgstr ""
 "de lectura. Por favor ejecute \"fusiondirectory-setup --check-config\" para "
 "corregir éste problema."
 
-#: html/index.php:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr "Error en Smarty"
 
-#: html/index.php:173
+#: html/index.php:172
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr "¡Su sesión de FusionDirectory ha expirado!"
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr "¡Tu IP ha cambiado!"
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr "¡Parámetro \"%s\" de plugin inválido!"
 
-#: html/index.php:217
+#: html/index.php:216
 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:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify a valid username!"
 msgstr "¡Por favor especifique un nombre de usuario válido!"
 
-#: html/index.php:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr "¡Por favor especifique su contraseña!"
 
-#: html/index.php:304
+#: html/index.php:303
 msgid "Please check the username/password combination."
 msgstr "Por favor verifique su combinación de usuario/contraseña"
 
-#: html/index.php:337
+#: html/index.php:336
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Cuenta bloqueada. ¡Por favor contacte a su administrador!"
 
-#: html/index.php:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:537
+#: html/index.php:536
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2545,45 +2545,46 @@ msgstr ""
 "La configuración %s/%s de FusionDirectory no tiene permisos de lectura. "
 "Abortado."
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr "Dirección de correo"
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr "No se encontró la cuenta de usuario: \"%s\""
 
-#: html/class_passwordRecovery.inc:474
+#: html/class_passwordRecovery.inc:475
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr "Se encontraron varias cuentas identificadas como: \"%s\""
 
-#: html/class_passwordRecovery.inc:507
+#: html/class_passwordRecovery.inc:508
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:519
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:573
+#: html/class_passwordRecovery.inc:574
 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:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr "Este token es inválido"
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 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á "
@@ -2986,6 +2987,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr "Nueva contraseña"
 
@@ -3031,7 +3033,7 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr ""
 
@@ -4167,45 +4169,49 @@ msgid "Show application groups"
 msgstr "Mostrar grupos de aplicación"
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr "Mostrar grupos primarios"
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Mostrar grupos de correo"
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Mostrar grupos Samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr "Mostrar grupos de servidores"
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr "Mostrar grupos de estaciones de trabajo"
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr "Mostrar grupos de Terminales"
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr "Mostrar grupos de impresión"
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr "Mostrar grupos de teléfono"
 
@@ -4707,37 +4713,52 @@ msgstr ""
 "botón 'Cambiar'. "
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Directorio"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Nombre de usuario"
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr "Repetir nueva contraseña"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr "Seguridad de la contraseña"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Directorio"
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr "Cambio"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 msgid "Click here to change your password"
 msgstr "Clic aquí para cambiar su contraseña"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr "Realizado con éxito"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Your password has been changed successfully."
 msgstr "Su contraseña ha sido cambiada con éxito."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
@@ -4745,13 +4766,13 @@ msgstr ""
 "Ingrese su dirección de correo actual en el siguiente campo y presione el "
 "botón 'Cambiar'."
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
@@ -4759,10 +4780,6 @@ msgstr ""
 "La recuperación de contraseña no está disponible. Si usted perdió su "
 "contraseña por favor contacte a su administrador."
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr "Pantalla de Acceso"
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
@@ -4771,11 +4788,6 @@ msgstr ""
 "Por favor ingrese su usuario y contraseña para acceder al sistema de "
 "administración."
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Nombre de usuario"
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr "Olvidé la contraseña"
@@ -4889,14 +4901,16 @@ msgstr ""
 msgid "Read only"
 msgstr "Solo lectura"
 
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+
 #: ihtml/themes/breezy/template.tpl.c:2
 msgid "Creating a new object using templates"
 msgstr "Crear un nuevo objeto utilizando plantillas"
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr "El equipo de FusionDirectory"
-
 #: plugins/generic/references/contents.tpl.c:2
 msgid "<strong>%1</strong> references our <strong>%3</strong>"
 msgstr "<strong>%1</strong>referencia nuestro<strong>%3</strong>"
diff --git a/locale/es_VE/fusiondirectory.po b/locale/es_VE/fusiondirectory.po
index f55d6763e3249d68e5201af3ac4fcbc6c3186ca5..65c7f0981efe98476bb4698f491da701047c8592 100644
--- a/locale/es_VE/fusiondirectory.po
+++ b/locale/es_VE/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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Spanish (Venezuela) (https://www.transifex.com/fusiondirectory/teams/12202/es_VE/)\n"
@@ -176,7 +176,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr "Aviso"
@@ -567,7 +567,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -786,8 +786,8 @@ msgstr "Seleccione todos"
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Error"
@@ -880,7 +880,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Error en la configuración"
 
@@ -927,7 +927,7 @@ msgstr "No puedo pegar"
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr "Inicio"
 
@@ -935,7 +935,7 @@ msgstr "Inicio"
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Plantilla"
@@ -2171,7 +2171,7 @@ msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr ""
@@ -2406,96 +2406,96 @@ msgstr "Smarty"
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "¡No se puede acceder a el directorio de compilación '%s'!"
 
-#: html/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr "Error Smarty"
 
-#: html/index.php:173
+#: html/index.php:172
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr "Su sesión de FusionDirectory ha expirado!"
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:217
+#: html/index.php:216
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify a valid username!"
 msgstr "¡Por favor introduzca un nombre de usuario válido!"
 
-#: html/index.php:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr "¡Por favor introduzca una contraseña!"
 
-#: html/index.php:304
+#: html/index.php:303
 msgid "Please check the username/password combination."
 msgstr "Por favor compruebe la combinación nombre de usuario/contraseña"
 
-#: html/index.php:337
+#: html/index.php:336
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 "Cuenta bloqueada. ¡Por favor contacte con su administrador de sistemas!"
 
-#: html/index.php:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:537
+#: html/index.php:536
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2509,45 +2509,46 @@ msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 "La configuración de FusionDirectory %s/%s no se puede leer. Cancelado."
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr "Dirección de correo"
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:474
+#: html/class_passwordRecovery.inc:475
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:507
+#: html/class_passwordRecovery.inc:508
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:519
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:573
+#: html/class_passwordRecovery.inc:574
 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:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr "Esta prenda es invalida"
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2941,6 +2942,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr "Nueva contraseña"
 
@@ -2985,7 +2987,7 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr "Correo Electrónico"
 
@@ -4071,45 +4073,49 @@ msgid "Show application groups"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr "Mostrar grupos primarios"
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Mostrar grupos de correo"
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Mostrar grupos de samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr ""
 
@@ -4596,37 +4602,52 @@ msgstr ""
 "clave nueva (dos veces) en los campos debajo y presione el botón 'Cambiar'."
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Directorio"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Nombre de Usuario"
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr "Repita la nueva contraseña"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr "Resistencia de la contraseña"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Directorio"
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr "Cambiar"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 msgid "Click here to change your password"
 msgstr "Pulse aquí para cambiar su contraseña"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr "Correcto"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Your password has been changed successfully."
 msgstr "Su contraseña se ha cambiado correctamente."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
@@ -4634,13 +4655,13 @@ msgstr ""
 "Introduzca su dirección de correo actual en el campo debajo y presione el "
 "botón 'Cambiar'"
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
@@ -4648,10 +4669,6 @@ msgstr ""
 "La recuperación de claves no está activada. Si ha perdido su clave por favor"
 " contacte a su administrador."
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr "Pantalla de inicio"
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
@@ -4660,11 +4677,6 @@ msgstr ""
 "Por favor use su nombre de usuario y contraseña para iniciar sesión en el "
 "sistema de administración."
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Nombre de Usuario"
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr "Olvidé mi clave"
@@ -4785,14 +4797,16 @@ msgstr ""
 msgid "Read only"
 msgstr "Solo lectura"
 
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+
 #: ihtml/themes/breezy/template.tpl.c:2
 msgid "Creating a new object using templates"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr "El equipo de FusionDirectory"
-
 #: plugins/generic/references/contents.tpl.c:2
 msgid "<strong>%1</strong> references our <strong>%3</strong>"
 msgstr ""
diff --git a/locale/fa_IR/fusiondirectory.po b/locale/fa_IR/fusiondirectory.po
index 356256c0638dcfeb40d33503631cb41cbecdc010..b25f5785cbcd378184bc2d25b0f63a5d7f0beef1 100644
--- a/locale/fa_IR/fusiondirectory.po
+++ b/locale/fa_IR/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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Persian (Iran) (https://www.transifex.com/fusiondirectory/teams/12202/fa_IR/)\n"
@@ -174,7 +174,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr ""
@@ -533,7 +533,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -749,8 +749,8 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "خطا"
@@ -843,7 +843,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
 
@@ -889,7 +889,7 @@ msgstr ""
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr ""
 
@@ -897,7 +897,7 @@ msgstr ""
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
@@ -2100,7 +2100,7 @@ msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr ""
@@ -2335,95 +2335,95 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:173
+#: html/index.php:172
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:217
+#: html/index.php:216
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:304
+#: html/index.php:303
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:337
+#: html/index.php:336
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:537
+#: html/index.php:536
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2434,44 +2434,45 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:474
+#: html/class_passwordRecovery.inc:475
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:507
+#: html/class_passwordRecovery.inc:508
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:519
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:573
+#: html/class_passwordRecovery.inc:574
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2861,6 +2862,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr "کلمه عبور جدید"
 
@@ -2904,7 +2906,7 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr "پست الکترونیک"
 
@@ -3986,45 +3988,49 @@ msgid "Show application groups"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr ""
 
@@ -4496,69 +4502,75 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
 "administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr ""
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr ""
@@ -4666,12 +4678,14 @@ msgstr ""
 msgid "Read only"
 msgstr ""
 
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
 msgstr ""
 
 #: plugins/generic/references/contents.tpl.c:2
diff --git a/locale/fi_FI/fusiondirectory.po b/locale/fi_FI/fusiondirectory.po
index 1eedc3d1207d317e46c929533db2eb6245bf296b..88d8b99222a3831476cd5c567f206f8552c67e90 100644
--- a/locale/fi_FI/fusiondirectory.po
+++ b/locale/fi_FI/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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Dina Solveig Jalkanen <dinsteri@gmail.com>, 2017\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/fusiondirectory/teams/12202/fi_FI/)\n"
@@ -174,7 +174,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr "Varoitus"
@@ -533,7 +533,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -749,8 +749,8 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Virhe"
@@ -843,7 +843,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
 
@@ -889,7 +889,7 @@ msgstr ""
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr ""
 
@@ -897,7 +897,7 @@ msgstr ""
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
@@ -2100,7 +2100,7 @@ msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr ""
@@ -2335,95 +2335,95 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:173
+#: html/index.php:172
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:217
+#: html/index.php:216
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:304
+#: html/index.php:303
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:337
+#: html/index.php:336
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:537
+#: html/index.php:536
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2434,44 +2434,45 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr "Sähköpostiosoite"
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:474
+#: html/class_passwordRecovery.inc:475
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:507
+#: html/class_passwordRecovery.inc:508
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:519
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:573
+#: html/class_passwordRecovery.inc:574
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2860,6 +2861,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr ""
 
@@ -2903,7 +2905,7 @@ msgid "Expiration date"
 msgstr "Eräpäivä"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr "Sähköposti"
 
@@ -3985,45 +3987,49 @@ msgid "Show application groups"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr ""
 
@@ -4495,69 +4501,75 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Hakemisto"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Hakemisto"
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
 "administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr ""
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr ""
@@ -4665,12 +4677,14 @@ msgstr ""
 msgid "Read only"
 msgstr ""
 
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
 msgstr ""
 
 #: plugins/generic/references/contents.tpl.c:2
diff --git a/locale/fr/fusiondirectory.po b/locale/fr/fusiondirectory.po
index 1629a073e81858944a7a898f1f4db127bccae2f6..47f9d709e62b13b02e63fac03afa0dcc03fda915 100644
--- a/locale/fr/fusiondirectory.po
+++ b/locale/fr/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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>, 2017\n"
 "Language-Team: French (https://www.transifex.com/fusiondirectory/teams/12202/fr/)\n"
@@ -189,7 +189,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr "Avertissement"
@@ -603,7 +603,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -824,8 +824,8 @@ msgstr "Sélectionner tout"
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Erreur"
@@ -920,7 +920,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Erreur de configuration"
 
@@ -969,7 +969,7 @@ msgstr "Impossible de coller"
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr "Identifiant"
 
@@ -977,7 +977,7 @@ msgstr "Identifiant"
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Modèle"
@@ -2261,7 +2261,7 @@ msgstr "Modèle de %s"
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr "Afficher %s"
@@ -2510,12 +2510,12 @@ msgstr ""
 "Le répertoire '%s' spécifié comme répertoire de compilation est inaccessible"
 " !"
 
-#: html/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, 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:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
@@ -2523,7 +2523,7 @@ 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:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
@@ -2532,80 +2532,80 @@ msgstr ""
 "Le fichier de configuration de FusionDirectory %s/%s ne peut être lu. "
 "Veuillez exécuter fusiondirectory-setup --check-config."
 
-#: html/index.php:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr "Erreur Smarty"
 
-#: html/index.php:173
+#: html/index.php:172
 #, 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:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr "Votre session FusionDirectory a expiré !"
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr "Votre IP a changé !"
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr "Paramètre de plugin «%s» invalide !"
 
-#: html/index.php:217
+#: html/index.php:216
 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:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr "Erreur de schéma LDAP"
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify a valid username!"
 msgstr "Veuillez entrer un nom d’utilisateur valide !"
 
-#: html/index.php:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr "Veuillez entrer votre mot de passe !"
 
-#: html/index.php:304
+#: html/index.php:303
 msgid "Please check the username/password combination."
 msgstr "Veuillez vérifier le nom d'utilisateur et le mot de passe."
 
-#: html/index.php:337
+#: html/index.php:336
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Compte verrouillé. Veuillez contacter votre administrateur système !"
 
-#: html/index.php:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr "Aucune valeur trouvée dans l’entête HTTP «%s»"
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 "L'utilisateur «%s» mentionné dans l’entête n'existe pas dans l'annuaire LDAP"
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr "La connexion avec l'utilisateur «%s» a provoqué l'erreur : %s"
 
-#: html/index.php:537
+#: html/index.php:536
 #, 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:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2620,48 +2620,49 @@ msgstr ""
 "Le fichier de configuration de FusionDirectory %s/%s ne peut être lu. "
 "Abandon."
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr "Adresse de courriel"
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr "Aucun compte utilisateur trouvé avec l’identifiant «%s»"
 
-#: html/class_passwordRecovery.inc:474
+#: html/class_passwordRecovery.inc:475
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr "Plusieurs comptes trouvés avec l’identifiant «%s»"
 
-#: html/class_passwordRecovery.inc:507
+#: html/class_passwordRecovery.inc:508
 #, 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:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr "Il y a plusieurs comptes qui utilisent le courriel «%s»"
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:519
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 "L'utilisateur correspondant au courriel «%s» est verrouillé. Veuillez "
 "contacter votre administrateur système !"
 
-#: html/class_passwordRecovery.inc:573
+#: html/class_passwordRecovery.inc:574
 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:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr "Le jeton n'est pas valide"
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 "Un problème est survenu avec le serveur de courriel, le courriel de "
@@ -3068,6 +3069,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
@@ -3113,7 +3115,7 @@ msgid "Expiration date"
 msgstr "Date d’expiration"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr "Courriel"
 
@@ -4279,45 +4281,49 @@ msgid "Show application groups"
 msgstr "Afficher les groupes d’applications"
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr "Afficher les groupes de groupes"
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr "Afficher des groupes non identifiés"
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr "Afficher les groupes principaux"
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Afficher les groupes de courriel"
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Afficher les groupes Samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr "Afficher les entrées DSA"
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr "Afficher les groupes de serveurs"
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr "Afficher les groupes de stations de travail"
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr "Afficher les groupes de terminaux"
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr "Afficher les groupes d’imprimantes"
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr "Afficher les groupes de téléphones"
 
@@ -4825,37 +4831,52 @@ msgstr ""
 "sur le bouton 'Changer'."
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Répertoire"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Nom d'utilisateur"
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr "Nouveau mot de passe (de nouveau)"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr "Sécurité du mot de passe"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Répertoire"
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr "Changer"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 msgid "Click here to change your password"
 msgstr "Cliquez ici pour changer votre mot de passe"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr "Réussi"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Your password has been changed successfully."
 msgstr "Votre mot de passe a été changé avec succès."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr "Retour a là fenêtre de connexion"
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
@@ -4863,7 +4884,7 @@ msgstr ""
 "Entrez votre adresse de courriel dans le champ ci-dessous et appuyez sur le "
 "bouton 'Changer'."
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
@@ -4871,7 +4892,7 @@ msgstr ""
 "=> Indiquez votre adresse complète, ex: Jules Martin => "
 "jules.martin@exemple.fr"
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
@@ -4879,10 +4900,6 @@ msgstr ""
 "La fonction de récupération de mot de passe n'est pas activée. Si vous avez "
 "perdu votre mot de passe, veuillez contacter votre administrateur réseau"
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr "Fenêtre de connexion"
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
@@ -4891,11 +4908,6 @@ msgstr ""
 "Veuillez entrer votre nom d'utilisateur et votre mot de passe afin de vous "
 "connecter."
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Nom d'utilisateur"
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr "J'ai perdu mon mot de passe"
@@ -5023,14 +5035,18 @@ msgstr ""
 msgid "Read only"
 msgstr "Lecture seule"
 
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">L'equipe de "
+"FusionDirectory, %2</a>"
+
 #: ihtml/themes/breezy/template.tpl.c:2
 msgid "Creating a new object using templates"
 msgstr "Création d’un nouvel objet depuis un modèle"
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr "L'équipe FusionDirectory"
-
 #: plugins/generic/references/contents.tpl.c:2
 msgid "<strong>%1</strong> references our <strong>%3</strong>"
 msgstr "<strong>%1</strong> fait référence à notre <strong>%3</strong>"
diff --git a/locale/hu_HU/fusiondirectory.po b/locale/hu_HU/fusiondirectory.po
index 4b145d4a367f089515be5d10cb7af31d4fb83449..ea4ecb41013f7ce6d22d061a9774b50615fbd125 100644
--- a/locale/hu_HU/fusiondirectory.po
+++ b/locale/hu_HU/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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Hungarian (Hungary) (https://www.transifex.com/fusiondirectory/teams/12202/hu_HU/)\n"
@@ -174,7 +174,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr ""
@@ -533,7 +533,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -749,8 +749,8 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr ""
@@ -843,7 +843,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
 
@@ -889,7 +889,7 @@ msgstr ""
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr ""
 
@@ -897,7 +897,7 @@ msgstr ""
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
@@ -2100,7 +2100,7 @@ msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr ""
@@ -2335,95 +2335,95 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:173
+#: html/index.php:172
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:217
+#: html/index.php:216
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:304
+#: html/index.php:303
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:337
+#: html/index.php:336
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:537
+#: html/index.php:536
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2434,44 +2434,45 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:474
+#: html/class_passwordRecovery.inc:475
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:507
+#: html/class_passwordRecovery.inc:508
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:519
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:573
+#: html/class_passwordRecovery.inc:574
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2860,6 +2861,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr ""
 
@@ -2903,7 +2905,7 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr ""
 
@@ -3985,45 +3987,49 @@ msgid "Show application groups"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr ""
 
@@ -4495,69 +4501,75 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
 "administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr ""
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr ""
@@ -4665,12 +4677,14 @@ msgstr ""
 msgid "Read only"
 msgstr ""
 
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
 msgstr ""
 
 #: plugins/generic/references/contents.tpl.c:2
diff --git a/locale/id/fusiondirectory.po b/locale/id/fusiondirectory.po
index be258058b97de0b9c987fa4dda059ad3e640d84a..255e1a71f6e28241e8c5e244d9b20fbf809af72c 100644
--- a/locale/id/fusiondirectory.po
+++ b/locale/id/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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Indonesian (https://www.transifex.com/fusiondirectory/teams/12202/id/)\n"
 "MIME-Version: 1.0\n"
@@ -173,7 +173,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr ""
@@ -532,7 +532,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -748,8 +748,8 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr ""
@@ -842,7 +842,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
 
@@ -888,7 +888,7 @@ msgstr ""
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr ""
 
@@ -896,7 +896,7 @@ msgstr ""
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
@@ -2099,7 +2099,7 @@ msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr ""
@@ -2334,95 +2334,95 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:173
+#: html/index.php:172
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:217
+#: html/index.php:216
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:304
+#: html/index.php:303
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:337
+#: html/index.php:336
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:537
+#: html/index.php:536
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2433,44 +2433,45 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:474
+#: html/class_passwordRecovery.inc:475
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:507
+#: html/class_passwordRecovery.inc:508
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:519
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:573
+#: html/class_passwordRecovery.inc:574
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2859,6 +2860,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr ""
 
@@ -2902,7 +2904,7 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr ""
 
@@ -3984,45 +3986,49 @@ msgid "Show application groups"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr ""
 
@@ -4494,69 +4500,75 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
 "administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr ""
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr ""
@@ -4664,12 +4676,14 @@ msgstr ""
 msgid "Read only"
 msgstr ""
 
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
 msgstr ""
 
 #: plugins/generic/references/contents.tpl.c:2
diff --git a/locale/it_IT/fusiondirectory.po b/locale/it_IT/fusiondirectory.po
index 03071902c3f51940ab57ba5d0306d45846af3dc8..c967348142e031390c7ff532641720eecf180073 100644
--- a/locale/it_IT/fusiondirectory.po
+++ b/locale/it_IT/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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Paola Penati <paola.penati@opensides.be>, 2017\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/fusiondirectory/teams/12202/it_IT/)\n"
@@ -187,7 +187,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr "Avvertimento"
@@ -606,7 +606,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -828,8 +828,8 @@ msgstr "Seleziona tutto"
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Errore"
@@ -924,7 +924,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Errore di configurazione"
 
@@ -972,7 +972,7 @@ msgstr "Impossibile incollare"
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr "Nome utente"
 
@@ -980,7 +980,7 @@ msgstr "Nome utente"
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Modello"
@@ -2260,7 +2260,7 @@ msgstr "Modello %s"
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr "Mostra %s"
@@ -2508,12 +2508,12 @@ msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 "La cartella '%s' dichiarata come cartella di compilazione è inaccessibile !"
 
-#: html/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr "Attenzione: la sessione  <a href=\"%s\"> non é crittografata!</a>"
 
-#: html/index.php:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
@@ -2521,7 +2521,7 @@ msgstr ""
 "Attenzione: la durata della sessione configurata nel fusiondirectory.conf "
 "verrà sostituita dalle impostazioni di php.ini."
 
-#: html/index.php:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
@@ -2530,79 +2530,79 @@ msgstr ""
 "La configurazione %s/%s di FusionDirectory non è leggibile. Esegui "
 "fusiondirectory-setup --check-config per risolvere questo problema."
 
-#: html/index.php:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr "Errore Smarty"
 
-#: html/index.php:173
+#: html/index.php:172
 #, 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:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr "La tua sessione in FusionDirectory è scaduta!"
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr "Il tuo IP è stato cambiato!"
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr "Parametro \"%s\" di plugin invalido"
 
-#: html/index.php:217
+#: html/index.php:216
 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:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr "Errore di schema LDAP"
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify a valid username!"
 msgstr "Prego specifica un nome utente valido !"
 
-#: html/index.php:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr "Prego specifica la tua password !"
 
-#: html/index.php:304
+#: html/index.php:303
 msgid "Please check the username/password combination."
 msgstr "Verifica il nome utente e la password."
 
-#: html/index.php:337
+#: html/index.php:336
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Conto bloccato. Contatta l'amministratore del sistema!"
 
-#: html/index.php:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr "Nessun valore trovato nell'header HTTP \"%s\""
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr "L'utente header \"%s\"  non è stato trovato nel LDAP"
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr "L'accesso con utente \"%s\" ha innescato l'errore: %s"
 
-#: html/index.php:537
+#: html/index.php:536
 #, 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:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2616,48 +2616,49 @@ msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 "Il file di configurazione %s/%s non è leggibile. Operazione Annullata."
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr "Indirizzo di posta elettronica"
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr "Alcun account trovato con login \"%s\" "
 
-#: html/class_passwordRecovery.inc:474
+#: html/class_passwordRecovery.inc:475
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr "Trovati più accounts con login \"%s\""
 
-#: html/class_passwordRecovery.inc:507
+#: html/class_passwordRecovery.inc:508
 #, 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:510
+#: html/class_passwordRecovery.inc:511
 #, 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:518
+#: html/class_passwordRecovery.inc:519
 #, 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:573
+#: html/class_passwordRecovery.inc:574
 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:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr "Questo token non è valido"
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 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 è "
@@ -3058,6 +3059,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr "Imposta la nuova password"
 
@@ -3103,7 +3105,7 @@ msgid "Expiration date"
 msgstr "Data di scadenza"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr "Indirizzo di posta elettronica"
 
@@ -4269,45 +4271,49 @@ msgid "Show application groups"
 msgstr "Mostra i gruppi di applicazioni"
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr "Mostra gruppi non identificati"
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr "Mostra i gruppi principali"
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Mostra i gruppi di posta elettronica"
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Mostra i gruppi samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr "Mostra voci DSA"
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr "Mostra i gruppi di servers"
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr "Mostra i gruppi di workstations"
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr "Mostra i gruppi di terminali"
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr "Mostra i gruppi di stampanti"
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr "Mostra i gruppi di telefoni"
 
@@ -4809,37 +4815,52 @@ msgstr ""
 "premi il pulsante 'Modifica'."
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Cartella"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Nome utente"
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr "Ripeti la nuova password"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr "Livello di sicurezza della password"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Cartella"
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr "Modifica"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 msgid "Click here to change your password"
 msgstr "Premi qui per cambiare la tua password."
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr "Completato"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Your password has been changed successfully."
 msgstr "La tua password è stata modificata."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
@@ -4847,7 +4868,7 @@ msgstr ""
 "Inserisci il tuo indirizzo mail nel campo sottostante e premi il pulsante "
 "'Modifica'"
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
@@ -4855,7 +4876,7 @@ msgstr ""
 "=> Usa la tua e-mail nel formato lungo, per es.: John Doe => "
 "john.doe@example.com"
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
@@ -4863,10 +4884,6 @@ msgstr ""
 "Il recupero della password non è attivato. Se hai perso la tua password, "
 "contatta il tuo amministratore di rete."
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr "Schermata di connessione"
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
@@ -4875,11 +4892,6 @@ msgstr ""
 "Usa il tuo nome utente e la tua password per accedere all'amministrazione "
 "del sistema."
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Nome utente"
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr "Ho dimenticato la mia password"
@@ -5006,14 +5018,16 @@ msgstr ""
 msgid "Read only"
 msgstr "Solo lettura"
 
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+
 #: ihtml/themes/breezy/template.tpl.c:2
 msgid "Creating a new object using templates"
 msgstr "Crea un nuovo oggetto usando i modelli"
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr "Il team di FusionDirectory"
-
 #: plugins/generic/references/contents.tpl.c:2
 msgid "<strong>%1</strong> references our <strong>%3</strong>"
 msgstr "< strong> % 1 < / strong> referenze < strong> % 3 < / strong>"
diff --git a/locale/lv/fusiondirectory.po b/locale/lv/fusiondirectory.po
index b7a31a3db4e81d74b18e7dca6c24ec9e13425d38..4f8605784d6db92db4749ce66117980f1556c142 100644
--- a/locale/lv/fusiondirectory.po
+++ b/locale/lv/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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/fusiondirectory/teams/12202/lv/)\n"
@@ -174,7 +174,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr "Brīdinājums"
@@ -533,7 +533,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -749,8 +749,8 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Kļūda"
@@ -843,7 +843,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
 
@@ -889,7 +889,7 @@ msgstr ""
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr ""
 
@@ -897,7 +897,7 @@ msgstr ""
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
@@ -2100,7 +2100,7 @@ msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr ""
@@ -2335,95 +2335,95 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:173
+#: html/index.php:172
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:217
+#: html/index.php:216
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:304
+#: html/index.php:303
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:337
+#: html/index.php:336
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:537
+#: html/index.php:536
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2434,44 +2434,45 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr "E-pasta adrese"
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:474
+#: html/class_passwordRecovery.inc:475
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:507
+#: html/class_passwordRecovery.inc:508
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:519
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:573
+#: html/class_passwordRecovery.inc:574
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2860,6 +2861,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr ""
 
@@ -2903,7 +2905,7 @@ msgid "Expiration date"
 msgstr "Derīguma termiņš"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr "E-pasts"
 
@@ -3985,45 +3987,49 @@ msgid "Show application groups"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr ""
 
@@ -4495,69 +4501,75 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
 "administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr ""
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr ""
@@ -4667,12 +4679,14 @@ msgstr ""
 msgid "Read only"
 msgstr ""
 
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
 msgstr ""
 
 #: plugins/generic/references/contents.tpl.c:2
diff --git a/locale/nb/fusiondirectory.po b/locale/nb/fusiondirectory.po
index 6880f8dbf3b103b3e74d341d071db1859de0bd32..2b0b66a2f17f0a7f743d3cf913a41084f921edaf 100644
--- a/locale/nb/fusiondirectory.po
+++ b/locale/nb/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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/fusiondirectory/teams/12202/nb/)\n"
@@ -174,7 +174,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr ""
@@ -533,7 +533,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -749,8 +749,8 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Feil"
@@ -843,7 +843,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
 
@@ -889,7 +889,7 @@ msgstr ""
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr ""
 
@@ -897,7 +897,7 @@ msgstr ""
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
@@ -2100,7 +2100,7 @@ msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr ""
@@ -2335,95 +2335,95 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:173
+#: html/index.php:172
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:217
+#: html/index.php:216
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:304
+#: html/index.php:303
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:337
+#: html/index.php:336
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:537
+#: html/index.php:536
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2434,44 +2434,45 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:474
+#: html/class_passwordRecovery.inc:475
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:507
+#: html/class_passwordRecovery.inc:508
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:519
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:573
+#: html/class_passwordRecovery.inc:574
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2860,6 +2861,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr ""
 
@@ -2903,7 +2905,7 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr ""
 
@@ -3985,45 +3987,49 @@ msgid "Show application groups"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr ""
 
@@ -4495,69 +4501,75 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
 "administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr ""
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr ""
@@ -4665,12 +4677,14 @@ msgstr ""
 msgid "Read only"
 msgstr ""
 
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
 msgstr ""
 
 #: plugins/generic/references/contents.tpl.c:2
diff --git a/locale/nl/fusiondirectory.po b/locale/nl/fusiondirectory.po
index c875a5c8879feec1e1062fdded88ae6da90700a0..33f5cf6bb67b52c13c486ee1ce854a7d8d5f69e0 100644
--- a/locale/nl/fusiondirectory.po
+++ b/locale/nl/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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Selina Oudermans <selina.oudermans@digipolis.be>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/fusiondirectory/teams/12202/nl/)\n"
@@ -176,7 +176,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr "Waarschuwing"
@@ -582,7 +582,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -801,8 +801,8 @@ msgstr "Selecteer alles"
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Fout"
@@ -895,7 +895,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Configuratie fout"
 
@@ -942,7 +942,7 @@ msgstr "Kan niet plakken"
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr "Inlognaam"
 
@@ -950,7 +950,7 @@ msgstr "Inlognaam"
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Sjabloon"
@@ -2183,7 +2183,7 @@ msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr ""
@@ -2420,95 +2420,95 @@ msgstr ""
 "Directory '%s' die opgegeven is als compileer directory is niet "
 "toegankelijk!"
 
-#: html/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr "Smarty error"
 
-#: html/index.php:173
+#: html/index.php:172
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr "Je FusionDirectory sessie is vervallen!"
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr "Je IP-adres is gewijzigd"
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:217
+#: html/index.php:216
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify a valid username!"
 msgstr "Geef a.u.b. een geldige gebruikersnaam op!"
 
-#: html/index.php:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr "Geef a.u.b. uw wachtwoord op!"
 
-#: html/index.php:304
+#: html/index.php:303
 msgid "Please check the username/password combination."
 msgstr "Controleer a.u.b. de gebruikersnaam/wachtwoord combinatie."
 
-#: html/index.php:337
+#: html/index.php:336
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Accound geblokkeerd. Contacteer aub je systeembeheerder!"
 
-#: html/index.php:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:537
+#: html/index.php:536
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2521,44 +2521,45 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "FusionDirectory configuratie %s/%s is niet leesbaar. Geannuleerd."
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr "E-mail adres"
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr "Kan geen account vinden met login \"%s\""
 
-#: html/class_passwordRecovery.inc:474
+#: html/class_passwordRecovery.inc:475
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr "Er zijn meerdere accounts gevonden met login \"%s\""
 
-#: html/class_passwordRecovery.inc:507
+#: html/class_passwordRecovery.inc:508
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:519
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:573
+#: html/class_passwordRecovery.inc:574
 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:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr "Deze token is niet geldig"
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 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"
@@ -2954,6 +2955,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
@@ -2998,7 +3000,7 @@ msgid "Expiration date"
 msgstr "Vervaldatum"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr "E-mail"
 
@@ -4080,45 +4082,49 @@ msgid "Show application groups"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr "Toon primaire groepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Toon mailgroepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Toon Samba groepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr "Toon server groepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr "Toon workstation groepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr "Toon printer groepen"
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr "Toon telefoon groepen"
 
@@ -4606,37 +4612,52 @@ msgstr ""
 "'Verander' knop."
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Directory"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Gebruikersnaam"
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr "Nieuw wachtwoord opnieuw"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr "Wachtwoord sterkte"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Directory"
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr "Wijzig"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 msgid "Click here to change your password"
 msgstr "Klik hier om je paswoord te wijzigen"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr "Succes"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Your password has been changed successfully."
 msgstr "Je paswoord is succesvol gewijzigd."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
@@ -4644,13 +4665,13 @@ msgstr ""
 "Vul je huidige e-mail adres in in onderstaand veld en klik op de 'Verander' "
 "knop."
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
@@ -4658,10 +4679,6 @@ msgstr ""
 "Paswoord herstel is niet geactiveerd. Als u uw wachtwoord verloren hebt, "
 "gelieve dan uw beheerder te contacteren"
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr "Login scherm"
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
@@ -4670,11 +4687,6 @@ msgstr ""
 "Gebruik aub je gebruikersnaam en paswoord om in te loggen in het "
 "administratie systeem van de site."
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Gebruikersnaam"
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr "Ik ben mijn wachtwoord vergeten"
@@ -4792,14 +4804,16 @@ msgstr ""
 msgid "Read only"
 msgstr "Read only"
 
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+
 #: ihtml/themes/breezy/template.tpl.c:2
 msgid "Creating a new object using templates"
 msgstr "Een nieuw object aanmaken aan de hand  van een template"
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr "Het FusionDirectory team"
-
 #: plugins/generic/references/contents.tpl.c:2
 msgid "<strong>%1</strong> references our <strong>%3</strong>"
 msgstr ""
diff --git a/locale/pl/fusiondirectory.po b/locale/pl/fusiondirectory.po
index a16a7bf6cbd354f833ddcde1f2699565a5d41056..f26ac433ff20fc8fe338f6100b1ff9ede769fdc8 100644
--- a/locale/pl/fusiondirectory.po
+++ b/locale/pl/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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/fusiondirectory/teams/12202/pl/)\n"
@@ -174,7 +174,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr "Ostrzeżenie"
@@ -533,7 +533,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -749,8 +749,8 @@ msgstr "Wybierz wszystko"
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Błąd"
@@ -843,7 +843,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Błąd konfiguracji"
 
@@ -889,7 +889,7 @@ msgstr "Nie można wkleić"
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr "Login"
 
@@ -897,7 +897,7 @@ msgstr "Login"
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Szablon"
@@ -2102,7 +2102,7 @@ msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr ""
@@ -2337,95 +2337,95 @@ msgstr "Smarty"
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "Katalog '%s' podany jako katalog kompilacji jest niedostępny!"
 
-#: html/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr "Błąd Smarty"
 
-#: html/index.php:173
+#: html/index.php:172
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:217
+#: html/index.php:216
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify a valid username!"
 msgstr "Proszę podać prawidłową nazwę użytkownika!"
 
-#: html/index.php:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr "Proszę podać prawidłowe hasło!"
 
-#: html/index.php:304
+#: html/index.php:303
 msgid "Please check the username/password combination."
 msgstr "Proszę sprawdzić kombinację login/hasło."
 
-#: html/index.php:337
+#: html/index.php:336
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:537
+#: html/index.php:536
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2438,44 +2438,45 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr "Adres email"
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:474
+#: html/class_passwordRecovery.inc:475
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:507
+#: html/class_passwordRecovery.inc:508
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:519
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:573
+#: html/class_passwordRecovery.inc:574
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2864,6 +2865,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr "Nowe hasło"
 
@@ -2907,7 +2909,7 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr "Email"
 
@@ -3989,45 +3991,49 @@ msgid "Show application groups"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr "Pokaż podstawowe grupy"
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Pokaż grupy samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr ""
 
@@ -4499,69 +4505,75 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Katalog"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Nazwa użytkownika"
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Katalog"
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr "Zmień"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 msgid "Click here to change your password"
 msgstr "Kliknij tutaj aby zmienić swoje hasło"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr "Powodzenie"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Your password has been changed successfully."
 msgstr "Twoje hasło zostało pomyślnie zmienione."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr "Ekran Logowania"
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
 "administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Nazwa użytkownika"
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr ""
@@ -4677,12 +4689,14 @@ msgstr ""
 msgid "Read only"
 msgstr "Tylko do odczytu"
 
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
 msgstr ""
 
 #: plugins/generic/references/contents.tpl.c:2
diff --git a/locale/pt/fusiondirectory.po b/locale/pt/fusiondirectory.po
index fa0abaea7df85f3fe22948f1c4afa2478337d29e..3127f8f3a0bd9bb527495de31569563b3399d535 100644
--- a/locale/pt/fusiondirectory.po
+++ b/locale/pt/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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/fusiondirectory/teams/12202/pt/)\n"
@@ -174,7 +174,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr "Atenção"
@@ -533,7 +533,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -749,8 +749,8 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Erro"
@@ -843,7 +843,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Erro de configuração"
 
@@ -889,7 +889,7 @@ msgstr "Impossível colar"
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr "Login"
 
@@ -897,7 +897,7 @@ msgstr "Login"
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Modelo"
@@ -2103,7 +2103,7 @@ msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr ""
@@ -2338,95 +2338,95 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:173
+#: html/index.php:172
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:217
+#: html/index.php:216
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify a valid username!"
 msgstr "Por favor, especifique um nome de usuário válido!"
 
-#: html/index.php:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr "Por favor, especifique sua senha!"
 
-#: html/index.php:304
+#: html/index.php:303
 msgid "Please check the username/password combination."
 msgstr "Por favor, verifique a combinação usuário / senha"
 
-#: html/index.php:337
+#: html/index.php:336
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:537
+#: html/index.php:536
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2439,44 +2439,45 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:474
+#: html/class_passwordRecovery.inc:475
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:507
+#: html/class_passwordRecovery.inc:508
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:519
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:573
+#: html/class_passwordRecovery.inc:574
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2865,6 +2866,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr "Nova senha"
 
@@ -2908,7 +2910,7 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr ""
 
@@ -3990,45 +3992,49 @@ msgid "Show application groups"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr ""
 
@@ -4500,69 +4506,75 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Diretório"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Nome do usuário"
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr "Nova senha repetida"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Diretório"
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr "Alterar"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 msgid "Click here to change your password"
 msgstr "Clique aqui para alterar sua senha"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr "Sucesso"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Your password has been changed successfully."
 msgstr "Sua senha foi alterada com sucesso."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
 "administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Nome do usuário"
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr ""
@@ -4672,12 +4684,14 @@ msgstr ""
 msgid "Read only"
 msgstr ""
 
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
 msgstr ""
 
 #: plugins/generic/references/contents.tpl.c:2
diff --git a/locale/pt_BR/fusiondirectory.po b/locale/pt_BR/fusiondirectory.po
index a91e25eb5b473d001b8aa407c2c662d8ed1333cc..7e2a4427b7895113b4b1048278d98e21dd6141a0 100644
--- a/locale/pt_BR/fusiondirectory.po
+++ b/locale/pt_BR/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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/fusiondirectory/teams/12202/pt_BR/)\n"
@@ -176,7 +176,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr "Aviso"
@@ -562,7 +562,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -778,8 +778,8 @@ msgstr "Selecionar tudo"
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Erro"
@@ -872,7 +872,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Erro de configuração"
 
@@ -918,7 +918,7 @@ msgstr ""
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr "Login"
 
@@ -926,7 +926,7 @@ msgstr "Login"
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Modelo"
@@ -2133,7 +2133,7 @@ msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr "Mostrar %s"
@@ -2369,18 +2369,18 @@ 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/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
@@ -2389,77 +2389,77 @@ 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:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr "Erro Smarty"
 
-#: html/index.php:173
+#: html/index.php:172
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr "Sua sessão foi encerrada!"
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:217
+#: html/index.php:216
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify a valid username!"
 msgstr "Por favor, especifique um nome de usuário válido!"
 
-#: html/index.php:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr "Por favor, especifique sua senha!"
 
-#: html/index.php:304
+#: html/index.php:303
 msgid "Please check the username/password combination."
 msgstr "Por favor, verifique o usuário ou senha."
 
-#: html/index.php:337
+#: html/index.php:336
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Conta bloqueada. Entre em contato com o administrador do sistema!"
 
-#: html/index.php:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:537
+#: html/index.php:536
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2472,46 +2472,47 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "Abortado. Configuração %s/%s do FusionDirectory não pôde ser lida."
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr "Endereço de email"
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:474
+#: html/class_passwordRecovery.inc:475
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:507
+#: html/class_passwordRecovery.inc:508
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:519
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:573
+#: html/class_passwordRecovery.inc:574
 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:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2905,6 +2906,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr "Nova senha"
 
@@ -2948,7 +2950,7 @@ msgid "Expiration date"
 msgstr "Data de expiração"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr "Email"
 
@@ -4044,45 +4046,49 @@ msgid "Show application groups"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr ""
 
@@ -4556,49 +4562,64 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Diretório"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Nome de usuário"
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr "Nova senha repetida"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr "Grau de segurança da senha"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Diretório"
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr "Alterar"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 msgid "Click here to change your password"
 msgstr "Clique aqui para alterar sua senha"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr "Sucesso"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Your password has been changed successfully."
 msgstr "Sua senha foi alterada com sucesso."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
@@ -4606,10 +4627,6 @@ msgstr ""
 "A recuperação de senha não foi ativada. Se você perdeu a sua senha, por "
 "favor, entre em contato com o administrador."
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr "Tela de login"
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
@@ -4618,11 +4635,6 @@ msgstr ""
 "Utilize seu nome de usuário e senha para fazer login no sistema de "
 "administração do site."
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Nome de usuário"
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr "Esqueci a senha"
@@ -4742,14 +4754,16 @@ msgstr ""
 msgid "Read only"
 msgstr "Somente leitura"
 
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+
 #: ihtml/themes/breezy/template.tpl.c:2
 msgid "Creating a new object using templates"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr "Equipe do FusionDirectory"
-
 #: plugins/generic/references/contents.tpl.c:2
 msgid "<strong>%1</strong> references our <strong>%3</strong>"
 msgstr ""
diff --git a/locale/ru/fusiondirectory.po b/locale/ru/fusiondirectory.po
index badc795296148b73eef70d73715095e9912f8046..b138f34aa88bca92a9e4f93b7ada215f1b740e23 100644
--- a/locale/ru/fusiondirectory.po
+++ b/locale/ru/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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Alexey Matveev <Tippet@yandex.ru>, 2017\n"
 "Language-Team: Russian (https://www.transifex.com/fusiondirectory/teams/12202/ru/)\n"
@@ -179,7 +179,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr "Предупреждение"
@@ -566,7 +566,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -785,8 +785,8 @@ msgstr "Выбрать все"
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Ошибка"
@@ -879,7 +879,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Ошибка конфигурации"
 
@@ -927,7 +927,7 @@ msgstr "Не могу вставить"
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr "Имя пользователя"
 
@@ -935,7 +935,7 @@ msgstr "Имя пользователя"
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Шаблон"
@@ -2168,7 +2168,7 @@ msgstr "шаблон %s "
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr "Показать %s"
@@ -2405,18 +2405,18 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
@@ -2425,79 +2425,79 @@ msgstr ""
 "Не прочесть конфигурацию FusionDirectory %s/%s. Чтобы исправить это "
 "пожалуйста запустите  fusiondirectory-setup --check-config."
 
-#: html/index.php:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr "Ошибка Smarty"
 
-#: html/index.php:173
+#: html/index.php:172
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr "Время вашей сессии истекло!"
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr "Ваш IP адрес изменен!"
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:217
+#: html/index.php:216
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr "Проверка схемы LDAP сообщает об ошибке:"
 
-#: html/index.php:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify a valid username!"
 msgstr "Введите корректное имя пользователя!"
 
-#: html/index.php:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr "Введите свой пароль!"
 
-#: html/index.php:304
+#: html/index.php:303
 msgid "Please check the username/password combination."
 msgstr "Проверьте, правильно ли вы ввели имя пользователя и пароль."
 
-#: html/index.php:337
+#: html/index.php:336
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 "Учетная запись заблокирована. Пожалуйста свяжитесь с вашим системным "
 "администратором."
 
-#: html/index.php:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:537
+#: html/index.php:536
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr "CAS пользователь \"%s\" не может быть найден в LDAP"
 
-#: html/index.php:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2510,46 +2510,47 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "Конфигурация FusionDirectory %s/%s не читаема. Прервано."
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr "Адрес электронной почты"
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr "Не найден аккаунт с логином \"%s\""
 
-#: html/class_passwordRecovery.inc:474
+#: html/class_passwordRecovery.inc:475
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr "Найдено множество учетных записей с логином \"%s\""
 
-#: html/class_passwordRecovery.inc:507
+#: html/class_passwordRecovery.inc:508
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:519
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:573
+#: html/class_passwordRecovery.inc:574
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 "Свяжитесь с вашим системным администратором, были проблемы с почтовым "
 "сервером"
 
-#: html/class_passwordRecovery.inc:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr "Были проблемы с почтовым сервером, имэйл подтверждения не отправлены"
 
@@ -2943,6 +2944,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr "Новый пароль"
 
@@ -2986,7 +2988,7 @@ msgid "Expiration date"
 msgstr "Дата окончания действия"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr "Email"
 
@@ -4107,45 +4109,49 @@ msgid "Show application groups"
 msgstr "Показать группы приложений"
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr "Показать неопознанные группы"
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr "Показать основные группы"
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Показывать группы mail"
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Показать группы samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr "Показать группы серверов"
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr "Показать группы рабочих станций"
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr "Показать группы терминалов"
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr "Показать группы принтеров"
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr "Показать группы телефонов"
 
@@ -4640,37 +4646,52 @@ msgstr ""
 "доступные ниже поля и нажмите кнопку \"Изменить\"."
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Каталог"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Имя пользователя"
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr "Надежность пароля"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Каталог"
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr "Изменить"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 msgid "Click here to change your password"
 msgstr "Нажмите, чтобы сменить пароль"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr "Успешно"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Your password has been changed successfully."
 msgstr "Ваш пароль был успешно изменен."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
@@ -4678,13 +4699,13 @@ msgstr ""
 "Введите ваш текущий адрес электронной почты в нижние поле и нажмите кнопку "
 "'Изменить'."
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
@@ -4692,10 +4713,6 @@ msgstr ""
 "Функция восстановления пароля не активирована. Если вы потеряли пароль, "
 "обратитесь к системному администратору."
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr "Окно входа"
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
@@ -4704,11 +4721,6 @@ msgstr ""
 "Пожалуйста используйте свое имя и пароль что бы войти в систему "
 "администрирования сайтом."
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Имя пользователя"
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr "Не помню пароль"
@@ -4823,14 +4835,16 @@ msgstr ""
 msgid "Read only"
 msgstr "Только для чтения"
 
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+
 #: ihtml/themes/breezy/template.tpl.c:2
 msgid "Creating a new object using templates"
 msgstr "Создание нового объекта используя шаблоны"
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr "Команда FusionDirectory"
-
 #: plugins/generic/references/contents.tpl.c:2
 msgid "<strong>%1</strong> references our <strong>%3</strong>"
 msgstr ""
diff --git a/locale/ru@petr1708/fusiondirectory.po b/locale/ru@petr1708/fusiondirectory.po
index c7c656e0edd1b783fbfaaf12458c8e5f7eecfbbe..3c7530cfaebab76c1a484bcb44838c4a7e7c9160 100644
--- a/locale/ru@petr1708/fusiondirectory.po
+++ b/locale/ru@petr1708/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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/fusiondirectory/teams/12202/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -173,7 +173,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr ""
@@ -532,7 +532,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -748,8 +748,8 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr ""
@@ -842,7 +842,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
 
@@ -888,7 +888,7 @@ msgstr ""
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr ""
 
@@ -896,7 +896,7 @@ msgstr ""
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
@@ -2099,7 +2099,7 @@ msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr ""
@@ -2334,95 +2334,95 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:173
+#: html/index.php:172
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:217
+#: html/index.php:216
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:304
+#: html/index.php:303
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:337
+#: html/index.php:336
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:537
+#: html/index.php:536
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2433,44 +2433,45 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:474
+#: html/class_passwordRecovery.inc:475
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:507
+#: html/class_passwordRecovery.inc:508
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:519
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:573
+#: html/class_passwordRecovery.inc:574
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2859,6 +2860,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr ""
 
@@ -2902,7 +2904,7 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr ""
 
@@ -3984,45 +3986,49 @@ msgid "Show application groups"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr ""
 
@@ -4494,69 +4500,75 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
 "administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr ""
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr ""
@@ -4664,12 +4676,14 @@ msgstr ""
 msgid "Read only"
 msgstr ""
 
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
 msgstr ""
 
 #: plugins/generic/references/contents.tpl.c:2
diff --git a/locale/sv/fusiondirectory.po b/locale/sv/fusiondirectory.po
index e2d3f76cc7e77d537c33588a7e8b133f665b3b32..f29cd3ab7c9a030a129eee66be60c0e26e40377c 100644
--- a/locale/sv/fusiondirectory.po
+++ b/locale/sv/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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/fusiondirectory/teams/12202/sv/)\n"
@@ -176,7 +176,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr "Varning"
@@ -577,7 +577,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -796,8 +796,8 @@ msgstr "Välj alla"
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Fel"
@@ -890,7 +890,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Konfigurationsfel"
 
@@ -937,7 +937,7 @@ msgstr "Kan inte klistra in"
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr "Användarnamn"
 
@@ -945,7 +945,7 @@ msgstr "Användarnamn"
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Mall"
@@ -2177,7 +2177,7 @@ msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr "Visa %s"
@@ -2413,18 +2413,18 @@ msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 "Katalogen '%s' specificerat som kompileringskatalog är inte tillgänglig!"
 
-#: html/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
@@ -2433,77 +2433,77 @@ 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:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr "Smarty-fel"
 
-#: html/index.php:173
+#: html/index.php:172
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr "Din FusionDirectory-session har gått ut!"
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:217
+#: html/index.php:216
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify a valid username!"
 msgstr "Ange ett giltigt användarnamn!"
 
-#: html/index.php:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr "Ange ditt lösenord!"
 
-#: html/index.php:304
+#: html/index.php:303
 msgid "Please check the username/password combination."
 msgstr "Kontrollera användarnamn/lösenord-kombinationen."
 
-#: html/index.php:337
+#: html/index.php:336
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Kontot låst. Kontakta systemadministratören!"
 
-#: html/index.php:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:537
+#: html/index.php:536
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2516,44 +2516,45 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "FusionDirectory-konfiguration %s/%s är inte läsbar. Avbryter."
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr "Epostadress"
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:474
+#: html/class_passwordRecovery.inc:475
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:507
+#: html/class_passwordRecovery.inc:508
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:519
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:573
+#: html/class_passwordRecovery.inc:574
 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:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 "Det uppstod ett problem med epostservern, bekräftelsebrevet skickades inte"
@@ -2949,6 +2950,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr "Nytt lösenord"
 
@@ -2992,7 +2994,7 @@ msgid "Expiration date"
 msgstr "Utgångsdatum"
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr ""
 
@@ -4107,45 +4109,49 @@ msgid "Show application groups"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr "Visa primära grupper"
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr "Visa mail-grupper"
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "Visa samba-grupper"
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr ""
 
@@ -4635,50 +4641,65 @@ msgstr ""
 "och tryck på 'Byt'-knappen."
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Katalog"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Användarnamn"
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr "Repetera nytt lösenord"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr "Lösenordsstyrka"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Katalog"
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr "Byt"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 msgid "Click here to change your password"
 msgstr "Klicka här för att byta lösenord"
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Your password has been changed successfully."
 msgstr "Ditt lösenord har nu bytts."
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 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/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
@@ -4686,10 +4707,6 @@ msgstr ""
 "Återskapande av lösenord är inte aktiverat. Om du har förlorat ditt "
 "lösenord, kontakta din administratör"
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr "Inloggningsskärm"
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
@@ -4698,11 +4715,6 @@ msgstr ""
 "Använd ditt användarnamn och lösenord för att logga in i "
 "administrationssystemet."
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Användarnamn"
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr "Jag har glömt mitt lösenord"
@@ -4817,14 +4829,16 @@ msgstr ""
 msgid "Read only"
 msgstr "Endast läsning"
 
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
+msgstr ""
+
 #: ihtml/themes/breezy/template.tpl.c:2
 msgid "Creating a new object using templates"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
-msgstr "FusionDirectory-teamet"
-
 #: plugins/generic/references/contents.tpl.c:2
 msgid "<strong>%1</strong> references our <strong>%3</strong>"
 msgstr ""
diff --git a/locale/ug/fusiondirectory.po b/locale/ug/fusiondirectory.po
index 5c9f0e11cc6c08fb3500c4bc793d17ec3cde378c..851303b0f2213c70d0aec0101b590f830214e5fe 100644
--- a/locale/ug/fusiondirectory.po
+++ b/locale/ug/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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Uighur (https://www.transifex.com/fusiondirectory/teams/12202/ug/)\n"
 "MIME-Version: 1.0\n"
@@ -173,7 +173,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr ""
@@ -532,7 +532,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -748,8 +748,8 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr ""
@@ -842,7 +842,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
 
@@ -888,7 +888,7 @@ msgstr ""
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr ""
 
@@ -896,7 +896,7 @@ msgstr ""
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr ""
@@ -2099,7 +2099,7 @@ msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr ""
@@ -2334,95 +2334,95 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:173
+#: html/index.php:172
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:217
+#: html/index.php:216
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:304
+#: html/index.php:303
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:337
+#: html/index.php:336
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:537
+#: html/index.php:536
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2433,44 +2433,45 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:474
+#: html/class_passwordRecovery.inc:475
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:507
+#: html/class_passwordRecovery.inc:508
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:519
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:573
+#: html/class_passwordRecovery.inc:574
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2859,6 +2860,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr ""
 
@@ -2902,7 +2904,7 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr ""
 
@@ -3984,45 +3986,49 @@ msgid "Show application groups"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr ""
 
@@ -4494,69 +4500,75 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
 "administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr ""
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr ""
@@ -4664,12 +4676,14 @@ msgstr ""
 msgid "Read only"
 msgstr ""
 
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
 msgstr ""
 
 #: plugins/generic/references/contents.tpl.c:2
diff --git a/locale/vi_VN/fusiondirectory.po b/locale/vi_VN/fusiondirectory.po
index 9c3439f5a7ced3cfcb5d37e3aef6231848bd7cb0..dffc1930aa3c64be1c5708799fa7be12b13ee2e7 100644
--- a/locale/vi_VN/fusiondirectory.po
+++ b/locale/vi_VN/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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/fusiondirectory/teams/12202/vi_VN/)\n"
@@ -174,7 +174,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr "Cảnh báo"
@@ -562,7 +562,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -778,8 +778,8 @@ msgstr "Chọn tất"
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "Lá»—i"
@@ -872,7 +872,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr "Lỗi cấu hình"
 
@@ -918,7 +918,7 @@ msgstr "Không thể paste"
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr "Đăng nhập"
 
@@ -926,7 +926,7 @@ msgstr "Đăng nhập"
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "Mẫu"
@@ -2151,7 +2151,7 @@ msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr ""
@@ -2387,96 +2387,96 @@ 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/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr "Lá»—i Smarty"
 
-#: html/index.php:173
+#: html/index.php:172
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:217
+#: html/index.php:216
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 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:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr "Xin hãy xác định mật mã của bạn!"
 
-#: html/index.php:304
+#: html/index.php:303
 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:337
+#: html/index.php:336
 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:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:537
+#: html/index.php:536
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2489,44 +2489,45 @@ msgstr ""
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:474
+#: html/class_passwordRecovery.inc:475
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:507
+#: html/class_passwordRecovery.inc:508
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:519
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:573
+#: html/class_passwordRecovery.inc:574
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2915,6 +2916,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr "Mật khẩu mới"
 
@@ -2958,7 +2960,7 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr ""
 
@@ -4040,45 +4042,49 @@ msgid "Show application groups"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr ""
 
@@ -4554,58 +4560,69 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "Thư mục"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "Tên người dùng"
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr "Mật khẩu mới được lặp lại"
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr "Ưu điểm của mật khẩu"
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "Thư mục"
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr "Thay đổi"
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 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/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr "Thành công"
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 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/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr "Màn hình đăng nhập"
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
@@ -4614,11 +4631,6 @@ msgstr ""
 "Xin hãy sử dụng tên và mật khẩu của bạn để đăng nhập vào trang hệ thống quản"
 " trị."
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "Tên người dùng"
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr ""
@@ -4735,12 +4747,14 @@ msgstr ""
 msgid "Read only"
 msgstr ""
 
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
 msgstr ""
 
 #: plugins/generic/references/contents.tpl.c:2
diff --git a/locale/zh/fusiondirectory.po b/locale/zh/fusiondirectory.po
index 5fb375a763b76f345cff40cd167d9bdefefef834..e81cf561308e531810d932568631e0b947901493 100644
--- a/locale/zh/fusiondirectory.po
+++ b/locale/zh/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: 2017-06-22 11:12+0200\n"
+"POT-Creation-Date: 2017-07-24 11:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fusiondirectory <contact@fusiondirectory.org>, 2016\n"
 "Language-Team: Chinese (https://www.transifex.com/fusiondirectory/teams/12202/zh/)\n"
@@ -174,7 +174,7 @@ msgstr ""
 #: setup/class_setupStepMigrate.inc:1004 setup/class_setupStepMigrate.inc:1123
 #: setup/class_setupStepMigrate.inc:1234 setup/class_setupStepMigrate.inc:1297
 #: setup/class_setupStepMigrate.inc:1341 include/functions.inc:846
-#: html/index.php:587 html/main.php:158 setup/setup_checks.tpl.c:8
+#: html/index.php:586 html/main.php:158 setup/setup_checks.tpl.c:8
 #: ihtml/themes/breezy/islocked.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:5
 msgid "Warning"
 msgstr "警告"
@@ -533,7 +533,7 @@ msgstr ""
 #: include/class_SnapshotHandler.inc:53 include/class_SnapshotHandler.inc:238
 #: include/class_SnapshotHandler.inc:268 include/class_SnapshotHandler.inc:284
 #: include/class_SnapshotHandler.inc:405 include/class_SnapshotHandler.inc:408
-#: html/index.php:372 plugins/addons/dashboard/class_dashBoardUsers.inc:86
+#: html/index.php:371 plugins/addons/dashboard/class_dashBoardUsers.inc:86
 #: plugins/addons/dashboard/class_dashBoard.inc:74
 #: plugins/addons/dashboard/class_dashBoardPasswords.inc:62
 #: plugins/config/class_recoveryConfig.inc:137
@@ -749,8 +749,8 @@ msgstr ""
 #: include/simpleplugin/attributes/class_FileAttribute.inc:34
 #: include/simpleplugin/attributes/class_FileAttribute.inc:37
 #: include/simpleplugin/attributes/class_FileAttribute.inc:300
-#: include/class_SnapshotHandler.inc:398 html/index.php:454 html/index.php:468
-#: html/index.php:478 html/index.php:535 html/index.php:545
+#: include/class_SnapshotHandler.inc:398 html/index.php:453 html/index.php:467
+#: html/index.php:477 html/index.php:534 html/index.php:544
 #: setup/setup_checks.tpl.c:5 ihtml/themes/breezy/msg_dialog.tpl.c:2
 msgid "Error"
 msgstr "错误"
@@ -843,7 +843,7 @@ msgstr ""
 #: include/functions.inc:657 include/class_timezone.inc:51
 #: include/class_config.inc:154 include/class_config.inc:276
 #: include/class_config.inc:791 include/class_config.inc:803
-#: html/index.php:148 html/class_passwordRecovery.inc:139 html/main.php:208
+#: html/index.php:147 html/class_passwordRecovery.inc:139 html/main.php:208
 msgid "Configuration error"
 msgstr ""
 
@@ -889,7 +889,7 @@ msgstr ""
 #: include/select/userSelect/class_userSelect.inc:32
 #: plugins/personal/generic/class_user.inc:383
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:62
-#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/recovery.tpl.c:26
+#: plugins/admin/users/user-list.xml:49 ihtml/themes/breezy/login.tpl.c:2
 msgid "Login"
 msgstr "登录名"
 
@@ -897,7 +897,7 @@ msgstr "登录名"
 #: include/simpleplugin/class_simpleManagement.inc:282
 #: include/simpleplugin/class_simpleManagement.inc:514
 #: plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #: ihtml/themes/breezy/template.tpl.c:5
 msgid "Template"
 msgstr "模板"
@@ -2100,7 +2100,7 @@ msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:508
 #: include/simpleplugin/class_simpleManagement.inc:514
-#: plugins/admin/groups/class_groupManagement.inc:350
+#: plugins/admin/groups/class_groupManagement.inc:351
 #, php-format
 msgid "Show %s"
 msgstr ""
@@ -2335,95 +2335,95 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "目录 '%s' 作为编译目录无法访问!"
 
-#: html/index.php:56 html/class_passwordRecovery.inc:173
+#: html/index.php:55 html/class_passwordRecovery.inc:174
 #, php-format
 msgid "Warning: <a href=\"%s\">Session is not encrypted!</a>"
 msgstr ""
 
-#: html/index.php:62
+#: html/index.php:61
 msgid ""
 "Warning: The session lifetime configured in your fusiondirectory.conf will "
 "be overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:150
+#: html/index.php:149
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:171
+#: html/index.php:170
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:173
+#: html/index.php:172
 #, php-format
 msgid "Directory \"%s\" specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:207
 msgid "Your FusionDirectory session has expired!"
 msgstr ""
 
-#: html/index.php:211
+#: html/index.php:210
 msgid "Your IP has changed!"
 msgstr ""
 
-#: html/index.php:214
+#: html/index.php:213
 #, php-format
 msgid "Invalid plugin parameter \"%s\"!"
 msgstr ""
 
-#: html/index.php:217
+#: html/index.php:216
 msgid "No session found!"
 msgstr ""
 
-#: html/index.php:253
+#: html/index.php:252
 msgid "LDAP schema check reported errors:"
 msgstr ""
 
-#: html/index.php:255
+#: html/index.php:254
 msgid "LDAP schema error"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:281
 msgid "Please specify a valid username!"
 msgstr "请输入一个有效的用户名!"
 
-#: html/index.php:285
+#: html/index.php:284
 msgid "Please specify your password!"
 msgstr "请输入您的口令!"
 
-#: html/index.php:304
+#: html/index.php:303
 msgid "Please check the username/password combination."
 msgstr "请检查用户名/口令。"
 
-#: html/index.php:337
+#: html/index.php:336
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:456
+#: html/index.php:455
 #, php-format
 msgid "No value found in HTTP header \"%s\""
 msgstr ""
 
-#: html/index.php:470
+#: html/index.php:469
 #, php-format
 msgid "Header user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:480 html/index.php:547
+#: html/index.php:479 html/index.php:546
 #, php-format
 msgid "Login with user \"%s\" triggered error: %s"
 msgstr ""
 
-#: html/index.php:537
+#: html/index.php:536
 #, php-format
 msgid "CAS user \"%s\" could not be found in the LDAP"
 msgstr ""
 
-#: html/index.php:587
+#: html/index.php:586
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -2434,44 +2434,45 @@ msgstr "您的浏览器已经禁用 cookies。请启用 cookies 并在登录前
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:302 ihtml/themes/breezy/recovery.tpl.c:71
+#: html/class_passwordRecovery.inc:303 ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:86
 msgid "Email address"
 msgstr "邮件地址"
 
-#: html/class_passwordRecovery.inc:471
+#: html/class_passwordRecovery.inc:472
 #, php-format
 msgid "Did not find an account with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:474
+#: html/class_passwordRecovery.inc:475
 #, php-format
 msgid "Found multiple accounts with login \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:507
+#: html/class_passwordRecovery.inc:508
 #, php-format
 msgid "There is no account using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There are several accounts using email \"%s\""
 msgstr ""
 
-#: html/class_passwordRecovery.inc:518
+#: html/class_passwordRecovery.inc:519
 #, php-format
 msgid "The user using email \"%s\" is locked. Please contact your administrator."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:573
+#: html/class_passwordRecovery.inc:574
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:586
+#: html/class_passwordRecovery.inc:587
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:650
+#: html/class_passwordRecovery.inc:651
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -2860,6 +2861,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:716
 #: ihtml/themes/breezy/recovery.tpl.c:29 ihtml/themes/breezy/recovery.tpl.c:32
+#: ihtml/themes/breezy/recovery.tpl.c:35
 msgid "New password"
 msgstr "新口令"
 
@@ -2903,7 +2905,7 @@ msgid "Expiration date"
 msgstr ""
 
 #: plugins/addons/dashboard/class_dashBoardUsers.inc:69
-#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:89
 msgid "Email"
 msgstr "邮件"
 
@@ -3985,45 +3987,49 @@ msgid "Show application groups"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:321
+msgid "Show groups of groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:322
 msgid "Show unidentified groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:324
+#: plugins/admin/groups/class_groupManagement.inc:325
 #: include/select/groupSelect/group-filter.tpl.c:5
 msgid "Show primary groups"
 msgstr "显示主要组"
 
-#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/groups/class_groupManagement.inc:327
 #: include/select/groupSelect/group-filter.tpl.c:11
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:330
 #: include/select/groupSelect/group-filter.tpl.c:8
 msgid "Show samba groups"
 msgstr "显示 samba 用户组"
 
-#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/class_groupManagement.inc:334
 msgid "Show DSA entries"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:339
+#: plugins/admin/groups/class_groupManagement.inc:340
 msgid "Show server groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:340
+#: plugins/admin/groups/class_groupManagement.inc:341
 msgid "Show workstation groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:341
+#: plugins/admin/groups/class_groupManagement.inc:342
 msgid "Show terminal groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:343
 msgid "Show printer groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:343
+#: plugins/admin/groups/class_groupManagement.inc:344
 msgid "Show phone groups"
 msgstr ""
 
@@ -4495,69 +4501,75 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/breezy/recovery.tpl.c:20 ihtml/themes/breezy/recovery.tpl.c:23
-#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
-#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
-#: ihtml/themes/breezy/login.tpl.c:35
-msgid "Directory"
-msgstr "目录"
+#: ihtml/themes/breezy/recovery.tpl.c:26 ihtml/themes/breezy/login.tpl.c:8
+#: ihtml/themes/breezy/login.tpl.c:11 ihtml/themes/breezy/login.tpl.c:14
+msgid "Username"
+msgstr "用户名"
 
-#: ihtml/themes/breezy/recovery.tpl.c:35 ihtml/themes/breezy/recovery.tpl.c:38
+#: ihtml/themes/breezy/recovery.tpl.c:38 ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:44
 msgid "New password repeated"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:41
+#: ihtml/themes/breezy/recovery.tpl.c:47
 msgid "Password strength"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:44 ihtml/themes/breezy/recovery.tpl.c:77
+#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:56 ihtml/themes/breezy/recovery.tpl.c:92
+#: ihtml/themes/breezy/recovery.tpl.c:95 ihtml/themes/breezy/recovery.tpl.c:98
+#: ihtml/themes/breezy/login.tpl.c:29 ihtml/themes/breezy/login.tpl.c:32
+#: ihtml/themes/breezy/login.tpl.c:35
+msgid "Directory"
+msgstr "目录"
+
+#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:104
 msgid "Change"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:47 ihtml/themes/breezy/recovery.tpl.c:80
+#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:107
 msgid "Click here to change your password"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:50 ihtml/themes/breezy/recovery.tpl.c:53
+#: ihtml/themes/breezy/recovery.tpl.c:65 ihtml/themes/breezy/recovery.tpl.c:68
 msgid "Success"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:56
+#: ihtml/themes/breezy/recovery.tpl.c:71
 msgid "Your password has been changed successfully."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:59
+#: ihtml/themes/breezy/recovery.tpl.c:74
+#: ihtml/themes/breezy/recovery.tpl.c:101
+msgid "Return to login screen"
+msgstr ""
+
+#: ihtml/themes/breezy/recovery.tpl.c:77
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:62
+#: ihtml/themes/breezy/recovery.tpl.c:80
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => "
 "john.doe@example.com"
 msgstr ""
 
-#: ihtml/themes/breezy/recovery.tpl.c:83
+#: ihtml/themes/breezy/recovery.tpl.c:110
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:2
-msgid "Login screen"
-msgstr ""
-
 #: ihtml/themes/breezy/login.tpl.c:5
 msgid ""
 "Please use your username and your password to log into the site "
 "administration system."
 msgstr ""
 
-#: ihtml/themes/breezy/login.tpl.c:8 ihtml/themes/breezy/login.tpl.c:11
-#: ihtml/themes/breezy/login.tpl.c:14
-msgid "Username"
-msgstr "用户名"
-
 #: ihtml/themes/breezy/login.tpl.c:26
 msgid "I forgot my password"
 msgstr ""
@@ -4666,12 +4678,14 @@ msgstr ""
 msgid "Read only"
 msgstr ""
 
-#: ihtml/themes/breezy/template.tpl.c:2
-msgid "Creating a new object using templates"
+#: ihtml/themes/breezy/copynotice.tpl.c:2
+msgid ""
+"&copy; 2002-%1 <a href=\"http://www.fusiondirectory.org\">The "
+"FusionDirectory team, %2</a>"
 msgstr ""
 
-#: plugins/generic/welcome/welcome.tpl.c:2
-msgid "The FusionDirectory team"
+#: ihtml/themes/breezy/template.tpl.c:2
+msgid "Creating a new object using templates"
 msgstr ""
 
 #: plugins/generic/references/contents.tpl.c:2