diff --git a/lam/locale/de_DE/LC_MESSAGES/messages.mo b/lam/locale/de_DE/LC_MESSAGES/messages.mo
index 3a198a95..f9e274fc 100644
Binary files a/lam/locale/de_DE/LC_MESSAGES/messages.mo and b/lam/locale/de_DE/LC_MESSAGES/messages.mo differ
diff --git a/lam/locale/de_DE/LC_MESSAGES/messages.po b/lam/locale/de_DE/LC_MESSAGES/messages.po
index 28d7f0e8..179bf0e9 100644
--- a/lam/locale/de_DE/LC_MESSAGES/messages.po
+++ b/lam/locale/de_DE/LC_MESSAGES/messages.po
@@ -4,13 +4,13 @@
 #
 # LDAP Account Manager
 #
-# Roland Gruber <post@rolandgruber.de>, 2004, 2005, 2006.
+# Roland Gruber <post@rolandgruber.de>, 2004, 2005, 2006, 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: post@rolandgruber.de \n"
 "POT-Creation-Date: 2004-01-14 17:45+0200\n"
-"PO-Revision-Date: 2006-12-29 20:29+0100\n"
+"PO-Revision-Date: 2007-01-14 18:58+0100\n"
 "Last-Translator: Roland Gruber <post@rolandgruber.de>\n"
 "Language-Team:  <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -85,7 +85,7 @@ msgstr ""
 "Benutzer können erlauben, dass andere in ihrem Namen handeln. Diese Option "
 "wird geprüft wenn über Kolab emails versendet werden."
 
-#: ../lib/modules/sambaSamAccount.inc:440
+#: ../lib/modules/sambaSamAccount.inc:443
 msgid "Abu Dhabi, Muscat, Baku"
 msgstr "Abu Dhabi, Muscat, Baku"
 
@@ -93,7 +93,7 @@ msgstr "Abu Dhabi, Muscat, Baku"
 msgid "Account"
 msgstr "Account"
 
-#: ../templates/massBuildAccounts.php:167 ../lib/modules/account.inc:117
+#: ../templates/massBuildAccounts.php:167 ../lib/modules/account.inc:131
 #: ../lib/modules/ieee802device.inc:85 ../lib/modules/posixGroup.inc:461
 #: ../lib/modules/posixGroup.inc:465 ../lib/modules/posixGroup.inc:466
 #: ../lib/modules/quota.inc:46 ../lib/modules/quota.inc:48
@@ -162,11 +162,11 @@ msgstr "Erstellung von Accounts mittels Dateiupload"
 msgid "Account deactivated"
 msgstr "Account deaktiviert"
 
-#: ../lib/modules/sambaSamAccount.inc:265
-#: ../lib/modules/sambaSamAccount.inc:343
-#: ../lib/modules/sambaSamAccount.inc:921
-#: ../lib/modules/sambaSamAccount.inc:1120
-#: ../lib/modules/sambaSamAccount.inc:1190
+#: ../lib/modules/sambaSamAccount.inc:268
+#: ../lib/modules/sambaSamAccount.inc:346
+#: ../lib/modules/sambaSamAccount.inc:932
+#: ../lib/modules/sambaSamAccount.inc:1131
+#: ../lib/modules/sambaSamAccount.inc:1201
 #: ../lib/modules/shadowAccount.inc:104 ../lib/modules/shadowAccount.inc:169
 #: ../lib/modules/shadowAccount.inc:201 ../lib/modules/shadowAccount.inc:289
 #: ../lib/modules/shadowAccount.inc:334
@@ -180,13 +180,18 @@ msgstr "Account ist deaktiviert"
 #: ../lib/modules/sambaAccount.inc:138 ../lib/modules/sambaAccount.inc:255
 #: ../lib/modules/sambaAccount.inc:367 ../lib/modules/sambaAccount.inc:370
 #: ../lib/modules/sambaAccount.inc:732 ../lib/modules/sambaSamAccount.inc:211
-#: ../lib/modules/sambaSamAccount.inc:214
-#: ../lib/modules/sambaSamAccount.inc:321
-#: ../lib/modules/sambaSamAccount.inc:887
-#: ../lib/modules/sambaSamAccount.inc:1178
+#: ../lib/modules/sambaSamAccount.inc:217
+#: ../lib/modules/sambaSamAccount.inc:324
+#: ../lib/modules/sambaSamAccount.inc:891
+#: ../lib/modules/sambaSamAccount.inc:1189
 msgid "Account is deactivated"
 msgstr "Account deaktiviert"
 
+#: ../lib/modules/sambaSamAccount.inc:214
+#: ../lib/modules/sambaSamAccount.inc:898
+msgid "Account is locked"
+msgstr "Account gesperrt"
+
 #: ../help/help.inc:139
 msgid "Account lists - Filters"
 msgstr "Accountlisten - Filter"
@@ -292,9 +297,9 @@ msgid "Adding attribute failed!"
 msgstr "Das Hinzufügen des Attributs ist fehlgeschlagen!"
 
 #: ../lib/modules/posixAccount.inc:214 ../lib/modules/posixAccount.inc:334
-#: ../lib/modules/posixAccount.inc:375 ../lib/modules/posixAccount.inc:836
-#: ../lib/modules/posixAccount.inc:914 ../lib/modules/posixAccount.inc:975
-#: ../lib/modules/posixAccount.inc:1033
+#: ../lib/modules/posixAccount.inc:375 ../lib/modules/posixAccount.inc:840
+#: ../lib/modules/posixAccount.inc:918 ../lib/modules/posixAccount.inc:979
+#: ../lib/modules/posixAccount.inc:1037
 msgid "Additional groups"
 msgstr "Zusätzliche Gruppen"
 
@@ -318,7 +323,7 @@ msgstr "Damit fügen Sie einer Gruppe ein neues Eingabefeld hinzu."
 msgid "Administrators group"
 msgstr "Administratoren"
 
-#: ../lib/modules/sambaSamAccount.inc:427
+#: ../lib/modules/sambaSamAccount.inc:430
 msgid "Alaska"
 msgstr "Alaska"
 
@@ -352,12 +357,12 @@ msgid "Allowed hosts"
 msgstr "Erlaubte PCs"
 
 #: ../lib/modules/sambaAccount.inc:830 ../lib/modules/sambaAccount.inc:831
-#: ../lib/modules/sambaSamAccount.inc:1020
-#: ../lib/modules/sambaSamAccount.inc:1021
+#: ../lib/modules/sambaSamAccount.inc:1031
+#: ../lib/modules/sambaSamAccount.inc:1032
 msgid "Allowed workstations"
 msgstr "Erlaubte PCs"
 
-#: ../lib/modules/sambaSamAccount.inc:442
+#: ../lib/modules/sambaSamAccount.inc:445
 msgid "Almaty, Dhaka, Colombo"
 msgstr "Almaty, Dhaka, Colombo"
 
@@ -386,7 +391,7 @@ msgstr "Ok"
 msgid "Are you sure you want to permanently delete this object?"
 msgstr "Soll dieses Objekt gelöscht werden?"
 
-#: ../lib/modules/sambaSamAccount.inc:432
+#: ../lib/modules/sambaSamAccount.inc:435
 msgid "Atlantic time (Canada), Caracas"
 msgstr "Atlantic time (Kanada), Caracas"
 
@@ -398,7 +403,7 @@ msgstr "Attribut"
 msgid "Attribute types"
 msgstr "Attributtypen"
 
-#: ../lib/modules/sambaSamAccount.inc:448
+#: ../lib/modules/sambaSamAccount.inc:451
 msgid "Auckland, Fiji, Kamchatka"
 msgstr "Auckland, Fiji, Kamchatka"
 
@@ -410,7 +415,7 @@ msgstr "Verfügbare PDF-Felder"
 msgid "Available account types"
 msgstr "Verfügbare Accounttypen"
 
-#: ../lib/modules/posixAccount.inc:926
+#: ../lib/modules/posixAccount.inc:930
 msgid "Available groups"
 msgstr "Verfügbare Gruppen"
 
@@ -422,22 +427,22 @@ msgstr "Verfügbare Module"
 msgid "Available users"
 msgstr "Verfügbare Benutzer"
 
-#: ../lib/modules/sambaAccount.inc:836 ../lib/modules/sambaSamAccount.inc:1026
+#: ../lib/modules/sambaAccount.inc:836 ../lib/modules/sambaSamAccount.inc:1037
 msgid "Available workstations"
 msgstr "Verfügbare PCs"
 
-#: ../lib/modules/sambaSamAccount.inc:435
+#: ../lib/modules/sambaSamAccount.inc:438
 msgid "Azores, Cape Verde Islands"
 msgstr "Azoren, Kap Verde Inseln"
 
 #: ../templates/tree/update_confirm.php:252 ../lib/modules/posixGroup.inc:238
 #: ../lib/modules/posixGroup.inc:261 ../lib/modules/sambaAccount.inc:841
-#: ../lib/modules/sambaSamAccount.inc:1030 ../lib/modules/posixAccount.inc:932
+#: ../lib/modules/sambaSamAccount.inc:1041 ../lib/modules/posixAccount.inc:936
 #: ../lib/modules/inetOrgPerson.inc:798 ../lib/modules/groupOfNames.inc:346
 msgid "Back"
 msgstr "Zurück"
 
-#: ../templates/config/index.php:113 ../templates/config/confmain.php:508
+#: ../templates/config/index.php:113 ../templates/config/confmain.php:516
 #: ../templates/config/conflogin.php:152 ../templates/config/mainlogin.php:137
 #: ../templates/selfService/adminLogin.php:149
 #: ../templates/selfService/adminMain.php:113 ../templates/logout.php:78
@@ -480,11 +485,11 @@ msgstr "Zurück zum Profileditor"
 msgid "Back to profile login"
 msgstr "Zurück zum Konfigurationslogin"
 
-#: ../lib/modules/sambaSamAccount.inc:439
+#: ../lib/modules/sambaSamAccount.inc:442
 msgid "Baghdad, Riyadh, Moscow"
 msgstr "Baghdad, Riyadh, Moskau"
 
-#: ../lib/modules/sambaSamAccount.inc:443
+#: ../lib/modules/sambaSamAccount.inc:446
 msgid "Bangkok, Hanoi, Jakarta"
 msgstr "Bangkok, Hanoi, Jakarta"
 
@@ -504,7 +509,7 @@ msgstr "Basismodul"
 msgid "Beginning"
 msgstr "Anfang"
 
-#: ../lib/modules/sambaSamAccount.inc:444
+#: ../lib/modules/sambaSamAccount.inc:447
 msgid "Beijing, Perth, Singapore"
 msgstr "Beijing, Perth, Singapur"
 
@@ -544,7 +549,7 @@ msgstr ""
 msgid "Block soft quota must be smaller than block hard quota."
 msgstr "Weiches Block-Quota muss kleiner sein als hartes Block-Quota."
 
-#: ../lib/modules/sambaSamAccount.inc:433
+#: ../lib/modules/sambaSamAccount.inc:436
 msgid "Brazil, Buenos Aires"
 msgstr "Brasilien, Buenos Aires"
 
@@ -560,16 +565,16 @@ msgstr "CSV-Datei:"
 msgid "Cache timeout"
 msgstr "Cache Zeitbegrenzung"
 
-#: ../templates/config/confmain.php:428
+#: ../templates/config/confmain.php:429
 msgid "Cache timeout is invalid!"
 msgstr "Cache Zeitbegrenzung ist ungültig!"
 
 #: ../lib/modules/sambaAccount.inc:382 ../lib/modules/sambaAccount.inc:385
 #: ../lib/modules/sambaAccount.inc:388 ../lib/modules/sambaAccount.inc:394
-#: ../lib/modules/sambaAccount.inc:406 ../lib/modules/sambaSamAccount.inc:226
-#: ../lib/modules/sambaSamAccount.inc:229
+#: ../lib/modules/sambaAccount.inc:406 ../lib/modules/sambaSamAccount.inc:229
 #: ../lib/modules/sambaSamAccount.inc:232
-#: ../lib/modules/sambaSamAccount.inc:238 ../lib/modules/posixAccount.inc:376
+#: ../lib/modules/sambaSamAccount.inc:235
+#: ../lib/modules/sambaSamAccount.inc:241 ../lib/modules/posixAccount.inc:376
 #: ../lib/modules/sambaGroupMapping.inc:305
 #: ../lib/modules/shadowAccount.inc:154 ../lib/modules/shadowAccount.inc:158
 #: ../lib/modules/shadowAccount.inc:162 ../lib/modules/shadowAccount.inc:166
@@ -579,15 +584,15 @@ msgstr "Kann leer bleiben."
 #: ../templates/tree/update_confirm.php:238
 #: ../templates/tree/delete_form.php:119 ../templates/tree/delete_form.php:168
 #: ../templates/ou_edit.php:107 ../templates/config/confmodules.php:115
-#: ../templates/config/confmain.php:387 ../templates/config/conftypes.php:236
+#: ../templates/config/confmain.php:388 ../templates/config/conftypes.php:236
 #: ../templates/selfService/adminMain.php:544
 #: ../templates/pdfedit/pdfdelete.php:92 ../templates/pdfedit/pdfpage.php:773
 #: ../templates/pdfedit/pdfmain.php:153 ../templates/delete.php:110
 #: ../templates/profedit/profiledelete.php:83
 #: ../templates/profedit/profilepage.php:253
 #: ../templates/profedit/profilemain.php:166 ../templates/initsuff.php:189
-#: ../lib/modules/sambaSamAccount.inc:1095
-#: ../lib/modules/sambaSamAccount.inc:1144 ../lib/modules/posixAccount.inc:955
+#: ../lib/modules/sambaSamAccount.inc:1106
+#: ../lib/modules/sambaSamAccount.inc:1155 ../lib/modules/posixAccount.inc:959
 #: ../lib/modules/kolabUser.inc:564 ../lib/modules/shadowAccount.inc:347
 #: ../lib/modules/inetOrgPerson.inc:761 ../lib/modules/groupOfNames.inc:225
 #: ../lib/modules/groupOfNames.inc:252 ../lib/modules/groupOfNames.inc:305
@@ -608,20 +613,20 @@ msgstr "Kann Konfigurationsdatei nicht öffnen!"
 msgid "Captions and labels"
 msgstr "Überschriften und Beschriftungen"
 
-#: ../lib/modules/sambaSamAccount.inc:437
+#: ../lib/modules/sambaSamAccount.inc:440
 msgid "Central Europe Time, Paris, Berlin"
 msgstr "Mitteleuropäische Zeit, Paris, Berlin"
 
-#: ../lib/modules/sambaSamAccount.inc:430
+#: ../lib/modules/sambaSamAccount.inc:433
 msgid "Central Time (US & Canada), Mexico City"
 msgstr "Central Time (USA & Kanada), Mexiko Stadt"
 
 #: ../templates/selfService/adminMain.php:406
 #: ../templates/pdfedit/pdfpage.php:499 ../templates/pdfedit/pdfpage.php:505
-#: ../lib/modules/sambaSamAccount.inc:900
-#: ../lib/modules/sambaSamAccount.inc:912
-#: ../lib/modules/sambaSamAccount.inc:924
-#: ../lib/modules/sambaSamAccount.inc:1140
+#: ../lib/modules/sambaSamAccount.inc:911
+#: ../lib/modules/sambaSamAccount.inc:923
+#: ../lib/modules/sambaSamAccount.inc:935
+#: ../lib/modules/sambaSamAccount.inc:1151
 #: ../lib/modules/shadowAccount.inc:292 ../lib/modules/shadowAccount.inc:343
 #: ../lib/modules/groupOfNames.inc:151 ../lib/modules/groupOfNames.inc:168
 msgid "Change"
@@ -639,7 +644,7 @@ msgstr "Standardprofil wechseln"
 msgid "Change master password"
 msgstr "Hauptpasswort ändern"
 
-#: ../lib/modules/posixGroup.inc:180 ../lib/modules/posixAccount.inc:865
+#: ../lib/modules/posixGroup.inc:180 ../lib/modules/posixAccount.inc:869
 #: ../lib/modules/inetOrgPerson.inc:601 ../help/help.inc:106
 msgid "Change password"
 msgstr "Passwort ändern"
@@ -652,7 +657,7 @@ msgstr "Profil ändern"
 msgid "Change suffix"
 msgstr "Suffix wechseln"
 
-#: ../lib/modules/posixAccount.inc:727
+#: ../lib/modules/posixAccount.inc:731
 msgid "Changed value because only ASCII characters are allowed."
 msgstr "Wert wurde geändert da nur ASCII-Zeichen erlaubt sind."
 
@@ -684,7 +689,7 @@ msgstr "Gemeinsam"
 msgid "Columns:"
 msgstr "Spalten:"
 
-#: ../lib/modules/sambaAccount.inc:394 ../lib/modules/sambaSamAccount.inc:238
+#: ../lib/modules/sambaAccount.inc:394 ../lib/modules/sambaSamAccount.inc:241
 msgid ""
 "Comma separated list of Samba workstations the user is allowed to login. "
 "Empty means every workstation."
@@ -697,10 +702,11 @@ msgid "Commit"
 msgstr "Bestätigen"
 
 #: ../lib/modules/posixAccount.inc:89 ../lib/modules/posixAccount.inc:195
-#: ../lib/modules/posixAccount.inc:379 ../lib/modules/posixAccount.inc:818
-#: ../lib/modules/posixAccount.inc:1028 ../lib/modules/inetOrgPerson.inc:68
-#: ../lib/modules/inetOrgPerson.inc:235 ../lib/modules/inetOrgPerson.inc:344
-#: ../lib/modules/inetOrgPerson.inc:570 ../lib/modules/inetOrgPerson.inc:825
+#: ../lib/modules/posixAccount.inc:379 ../lib/modules/posixAccount.inc:401
+#: ../lib/modules/posixAccount.inc:822 ../lib/modules/posixAccount.inc:1032
+#: ../lib/modules/inetOrgPerson.inc:68 ../lib/modules/inetOrgPerson.inc:235
+#: ../lib/modules/inetOrgPerson.inc:344 ../lib/modules/inetOrgPerson.inc:570
+#: ../lib/modules/inetOrgPerson.inc:825
 msgid "Common name"
 msgstr "Allgemeiner Name"
 
@@ -831,7 +837,7 @@ msgstr "Account erstellen"
 msgid "Create another account"
 msgstr "Weiteren Account anlegen"
 
-#: ../lib/modules/posixAccount.inc:845
+#: ../lib/modules/posixAccount.inc:849
 msgid "Create home directory"
 msgstr "Heimatverzeichnis anlegen"
 
@@ -885,11 +891,11 @@ msgstr "DSML-Export für: %s"
 msgid "Data field for RDN is empty!"
 msgstr "Datenfeld für RDN ist leer!"
 
-#: ../lib/modules/sambaAccount.inc:374 ../lib/modules/sambaSamAccount.inc:218
+#: ../lib/modules/sambaAccount.inc:374 ../lib/modules/sambaSamAccount.inc:221
 msgid "Date after the user is able to change his password. Format: DD-MM-YYYY"
 msgstr "Datum, nach dem der Benutzer sein Passwort ändern kann. Format: TT-MM-JJJJ"
 
-#: ../lib/modules/sambaAccount.inc:376 ../lib/modules/sambaSamAccount.inc:220
+#: ../lib/modules/sambaAccount.inc:376 ../lib/modules/sambaSamAccount.inc:223
 msgid "Date after the user must change his password. Format: DD-MM-YYYY"
 msgstr "Datum, nach dem der Benutzer sein Passwort ändern muss. Format: TT-MM-JJJJ"
 
@@ -959,7 +965,7 @@ msgstr "Lösche Domäne"
 msgid "Delete group"
 msgstr "Lösche Gruppe"
 
-#: ../lib/modules/posixAccount.inc:886
+#: ../lib/modules/posixAccount.inc:890
 msgid "Delete home directory"
 msgstr "Heimatverzeichnis löschen"
 
@@ -1024,12 +1030,12 @@ msgstr "Lösche. Bitte haben Sie ein wenig Geduld..."
 
 #: ../templates/tree/add_value_form.php:186 ../templates/schema/schema.php:94
 #: ../templates/schema/schema.php:148 ../templates/schema/schema.php:351
-#: ../lib/types/user.inc:92 ../lib/modules/account.inc:79
-#: ../lib/modules/account.inc:103 ../lib/modules/account.inc:203
-#: ../lib/modules/account.inc:217 ../lib/modules/posixGroup.inc:156
-#: ../lib/modules/posixGroup.inc:374 ../lib/modules/posixGroup.inc:436
-#: ../lib/modules/sambaAccount.inc:861 ../lib/modules/posixAccount.inc:293
-#: ../lib/modules/posixAccount.inc:397
+#: ../lib/types/user.inc:92 ../lib/modules/account.inc:83
+#: ../lib/modules/account.inc:93 ../lib/modules/account.inc:117
+#: ../lib/modules/account.inc:217 ../lib/modules/account.inc:231
+#: ../lib/modules/posixGroup.inc:156 ../lib/modules/posixGroup.inc:374
+#: ../lib/modules/posixGroup.inc:436 ../lib/modules/sambaAccount.inc:861
+#: ../lib/modules/posixAccount.inc:293 ../lib/modules/posixAccount.inc:397
 #: ../lib/modules/sambaGroupMapping.inc:327
 #: ../lib/modules/inetOrgPerson.inc:158 ../lib/modules/inetOrgPerson.inc:288
 #: ../lib/modules/inetOrgPerson.inc:577 ../lib/modules/inetOrgPerson.inc:810
@@ -1051,9 +1057,9 @@ msgstr "Meldet Benutzer ab, die außerhalb der definierten Anmeldezeiten aktiv s
 #: ../lib/modules/sambaAccount.inc:340 ../lib/modules/sambaAccount.inc:698
 #: ../lib/modules/sambaAccount.inc:854 ../lib/modules/sambaSamAccount.inc:93
 #: ../lib/modules/sambaSamAccount.inc:184
-#: ../lib/modules/sambaSamAccount.inc:285
-#: ../lib/modules/sambaSamAccount.inc:855
-#: ../lib/modules/sambaSamAccount.inc:1374
+#: ../lib/modules/sambaSamAccount.inc:288
+#: ../lib/modules/sambaSamAccount.inc:859
+#: ../lib/modules/sambaSamAccount.inc:1385
 #: ../lib/modules/sambaGroupMapping.inc:190
 #: ../lib/modules/sambaGroupMapping.inc:292
 #: ../lib/modules/sambaGroupMapping.inc:325
@@ -1095,13 +1101,13 @@ msgstr "Wollen Sie die Änderungen übernehmen?"
 #: ../lib/modules/sambaAccount.inc:177 ../lib/modules/sambaAccount.inc:321
 #: ../lib/modules/sambaAccount.inc:331 ../lib/modules/sambaAccount.inc:405
 #: ../lib/modules/sambaAccount.inc:803 ../lib/modules/sambaAccount.inc:860
-#: ../lib/modules/sambaSamAccount.inc:256
-#: ../lib/modules/sambaSamAccount.inc:278
-#: ../lib/modules/sambaSamAccount.inc:404
-#: ../lib/modules/sambaSamAccount.inc:985
-#: ../lib/modules/sambaSamAccount.inc:1238
-#: ../lib/modules/sambaSamAccount.inc:1268
-#: ../lib/modules/sambaSamAccount.inc:1380
+#: ../lib/modules/sambaSamAccount.inc:259
+#: ../lib/modules/sambaSamAccount.inc:281
+#: ../lib/modules/sambaSamAccount.inc:407
+#: ../lib/modules/sambaSamAccount.inc:996
+#: ../lib/modules/sambaSamAccount.inc:1249
+#: ../lib/modules/sambaSamAccount.inc:1279
+#: ../lib/modules/sambaSamAccount.inc:1391
 #: ../lib/modules/sambaGroupMapping.inc:68
 #: ../lib/modules/sambaGroupMapping.inc:220
 #: ../lib/modules/sambaGroupMapping.inc:304
@@ -1133,7 +1139,7 @@ msgstr "Domänen-Zertifikats-Administratoren"
 
 #: ../lib/modules/sambaAccount.inc:49 ../lib/modules/sambaAccount.inc:548
 #: ../lib/modules/sambaSamAccount.inc:66
-#: ../lib/modules/sambaSamAccount.inc:605
+#: ../lib/modules/sambaSamAccount.inc:609
 #: ../lib/modules/sambaGroupMapping.inc:58
 msgid "Domain computers"
 msgstr "Domänen-PCs"
@@ -1188,7 +1194,7 @@ msgid "Domain schema admins"
 msgstr "Domänen-Schema-Administratoren"
 
 #: ../lib/modules/sambaAccount.inc:48 ../lib/modules/sambaSamAccount.inc:65
-#: ../lib/modules/sambaSamAccount.inc:1637
+#: ../lib/modules/sambaSamAccount.inc:1648
 #: ../lib/modules/sambaGroupMapping.inc:56
 msgid "Domain users"
 msgstr "Domänenbenutzer"
@@ -1205,7 +1211,7 @@ msgstr "nach unten"
 msgid "Download sample CSV file"
 msgstr "Beispiel-CSV-Datei runterladen"
 
-#: ../lib/modules/sambaAccount.inc:379 ../lib/modules/sambaSamAccount.inc:223
+#: ../lib/modules/sambaAccount.inc:379 ../lib/modules/sambaSamAccount.inc:226
 msgid "Drive letter assigned on windows workstations as homedirectory."
 msgstr "Laufwerksbuchstabe, der als Heimatverzeichnis zugewiesen wird."
 
@@ -1238,15 +1244,15 @@ msgstr "EMail-Aliasliste hat ungültiges Format!"
 msgid "EMail aliases"
 msgstr "EMail-Aliase"
 
-#: ../lib/modules/sambaSamAccount.inc:446
+#: ../lib/modules/sambaSamAccount.inc:449
 msgid "East Australian Standard, Guam"
 msgstr "Ostaustralien, Guam"
 
-#: ../lib/modules/sambaSamAccount.inc:438
+#: ../lib/modules/sambaSamAccount.inc:441
 msgid "Eastern Europe Time, South Africa"
 msgstr "Osteuropäische Zeit, Südafrika"
 
-#: ../lib/modules/sambaSamAccount.inc:431
+#: ../lib/modules/sambaSamAccount.inc:434
 msgid "Eastern Time (US & Canada), Bogota"
 msgstr "Eastern Time (USA & Kanada), Bogota"
 
@@ -1266,11 +1272,11 @@ msgstr "Accounttypen ändern"
 msgid "Edit general settings"
 msgstr "Allgemeine Einstellungen ändern"
 
-#: ../lib/modules/posixAccount.inc:837
+#: ../lib/modules/posixAccount.inc:841
 msgid "Edit groups"
 msgstr "Gruppen ändern"
 
-#: ../lib/modules/sambaSamAccount.inc:991
+#: ../lib/modules/sambaSamAccount.inc:1002
 msgid "Edit logon hours"
 msgstr "Anmeldezeiten ändern"
 
@@ -1294,7 +1300,7 @@ msgstr "SelfService bearbeiten"
 msgid "Edit server profiles"
 msgstr "Serverprofile ändern"
 
-#: ../lib/modules/sambaAccount.inc:768 ../lib/modules/sambaSamAccount.inc:947
+#: ../lib/modules/sambaAccount.inc:768 ../lib/modules/sambaSamAccount.inc:958
 msgid "Edit workstations"
 msgstr "Arbeitsstationen ändern"
 
@@ -1316,7 +1322,7 @@ msgstr "Das Passwort war leer. Bitte erneut eingeben."
 msgid "Encountered an error while performing search."
 msgstr "Die LDAP-Suche ist fehlgeschlagen."
 
-#: ../lib/modules/sambaSamAccount.inc:424
+#: ../lib/modules/sambaSamAccount.inc:427
 msgid "Eniwetok, Kwajalein"
 msgstr "Eniwetok, Kwajalein"
 
@@ -1416,7 +1422,7 @@ msgstr "Faxnummer"
 msgid "File"
 msgstr "Datei"
 
-#: ../lib/modules/sambaSamAccount.inc:232
+#: ../lib/modules/sambaSamAccount.inc:235
 msgid ""
 "File name and path relative to netlogon-share which should be executed on "
 "logon. $user and $group are replaced with user and group name."
@@ -1475,7 +1481,7 @@ msgstr "Frei/Besetzt-Intervall"
 msgid "Free/Busy interval must be a number!"
 msgstr "Frei/Besetzt-Intervall muss eine Nummer sein!"
 
-#: ../lib/modules/sambaSamAccount.inc:1048
+#: ../lib/modules/sambaSamAccount.inc:1059
 msgid "Friday"
 msgstr "Freitag"
 
@@ -1483,7 +1489,7 @@ msgstr "Freitag"
 #: ../lib/modules/posixGroup.inc:152 ../lib/modules/posixGroup.inc:340
 #: ../lib/modules/posixGroup.inc:370 ../lib/modules/posixGroup.inc:390
 #: ../lib/modules/posixGroup.inc:434 ../lib/modules/posixGroup.inc:454
-#: ../lib/modules/posixAccount.inc:85 ../lib/modules/posixAccount.inc:1030
+#: ../lib/modules/posixAccount.inc:85 ../lib/modules/posixAccount.inc:1034
 #: ../lib/modules/sambaGroupMapping.inc:323
 msgid "GID number"
 msgstr "GID Nummer"
@@ -1512,7 +1518,7 @@ msgstr "GID-Nummer muss eine Zahl sein!"
 
 #: ../lib/modules/posixAccount.inc:249 ../lib/modules/posixAccount.inc:281
 #: ../lib/modules/posixAccount.inc:351 ../lib/modules/posixAccount.inc:389
-#: ../lib/modules/posixAccount.inc:826 ../lib/modules/posixAccount.inc:1031
+#: ../lib/modules/posixAccount.inc:830 ../lib/modules/posixAccount.inc:1035
 msgid "Gecos"
 msgstr "Gecos"
 
@@ -1649,7 +1655,7 @@ msgstr "Hartes Inode-Limit (Datein)"
 msgid "Hard inode limit"
 msgstr "hartes Inode-Limit"
 
-#: ../lib/modules/sambaSamAccount.inc:426
+#: ../lib/modules/sambaSamAccount.inc:429
 msgid "Hawaii"
 msgstr "Hawaii"
 
@@ -1675,7 +1681,7 @@ msgstr "Überschrift"
 #: ../templates/config/confmain.php:183 ../templates/config/confmain.php:206
 #: ../templates/config/confmain.php:261 ../templates/config/confmain.php:306
 #: ../templates/config/confmain.php:325 ../templates/config/confmain.php:334
-#: ../templates/config/confmain.php:352 ../templates/config/confmain.php:366
+#: ../templates/config/confmain.php:353 ../templates/config/confmain.php:367
 #: ../templates/config/conftypes.php:201 ../templates/config/conftypes.php:217
 #: ../templates/config/conflogin.php:128 ../templates/config/mainlogin.php:119
 #: ../templates/selfService/profManage.php:159
@@ -1814,8 +1820,8 @@ msgstr "Halten Sie Strg gedrückt um mehrere Gruppen zu markieren."
 #: ../lib/modules/posixAccount.inc:61 ../lib/modules/posixAccount.inc:63
 #: ../lib/modules/posixAccount.inc:220 ../lib/modules/posixAccount.inc:338
 #: ../lib/modules/posixAccount.inc:342 ../lib/modules/posixAccount.inc:359
-#: ../lib/modules/posixAccount.inc:652 ../lib/modules/posixAccount.inc:840
-#: ../lib/modules/posixAccount.inc:980 ../lib/modules/posixAccount.inc:1034
+#: ../lib/modules/posixAccount.inc:656 ../lib/modules/posixAccount.inc:844
+#: ../lib/modules/posixAccount.inc:984 ../lib/modules/posixAccount.inc:1038
 msgid "Home directory"
 msgstr "Heimatverzeichnis"
 
@@ -1830,11 +1836,11 @@ msgstr ""
 
 #: ../lib/modules/sambaAccount.inc:146 ../lib/modules/sambaAccount.inc:277
 #: ../lib/modules/sambaAccount.inc:378 ../lib/modules/sambaAccount.inc:755
-#: ../lib/modules/sambaAccount.inc:856 ../lib/modules/sambaSamAccount.inc:222
-#: ../lib/modules/sambaSamAccount.inc:350
-#: ../lib/modules/sambaSamAccount.inc:934
-#: ../lib/modules/sambaSamAccount.inc:1203
-#: ../lib/modules/sambaSamAccount.inc:1376
+#: ../lib/modules/sambaAccount.inc:856 ../lib/modules/sambaSamAccount.inc:225
+#: ../lib/modules/sambaSamAccount.inc:353
+#: ../lib/modules/sambaSamAccount.inc:945
+#: ../lib/modules/sambaSamAccount.inc:1214
+#: ../lib/modules/sambaSamAccount.inc:1387
 msgid "Home drive"
 msgstr "Heimatlaufwerk"
 
@@ -1843,11 +1849,11 @@ msgstr "Heimatlaufwerk"
 #: ../lib/modules/sambaAccount.inc:381 ../lib/modules/sambaAccount.inc:758
 #: ../lib/modules/sambaAccount.inc:855 ../lib/modules/sambaSamAccount.inc:76
 #: ../lib/modules/sambaSamAccount.inc:77
-#: ../lib/modules/sambaSamAccount.inc:225
-#: ../lib/modules/sambaSamAccount.inc:356
-#: ../lib/modules/sambaSamAccount.inc:937
-#: ../lib/modules/sambaSamAccount.inc:1209
-#: ../lib/modules/sambaSamAccount.inc:1375
+#: ../lib/modules/sambaSamAccount.inc:228
+#: ../lib/modules/sambaSamAccount.inc:359
+#: ../lib/modules/sambaSamAccount.inc:948
+#: ../lib/modules/sambaSamAccount.inc:1220
+#: ../lib/modules/sambaSamAccount.inc:1386
 msgid "Home path"
 msgstr "Heimatverzeichnis"
 
@@ -1868,19 +1874,19 @@ msgstr "Hostaccounts (z.B. Samba)"
 msgid "Host description"
 msgstr "Hostbeschreibung"
 
-#: ../lib/modules/account.inc:80 ../lib/modules/posixAccount.inc:390
+#: ../lib/modules/account.inc:84 ../lib/modules/posixAccount.inc:390
 #: ../lib/modules/posixAccount.inc:398
 msgid "Host description. If left empty host name will be used."
 msgstr "Hostbeschreibung. Falls leer wird der Hostname verwendet."
 
-#: ../lib/modules/account.inc:89
+#: ../lib/modules/account.inc:103
 msgid "Host list"
 msgstr "Hostliste"
 
 #: ../lib/types/host.inc:82 ../lib/types/host.inc:83
-#: ../lib/modules/posixAccount.inc:75 ../lib/modules/posixAccount.inc:76
-#: ../lib/modules/posixAccount.inc:78 ../lib/modules/posixAccount.inc:260
-#: ../lib/modules/posixAccount.inc:385
+#: ../lib/modules/account.inc:79 ../lib/modules/posixAccount.inc:75
+#: ../lib/modules/posixAccount.inc:76 ../lib/modules/posixAccount.inc:78
+#: ../lib/modules/posixAccount.inc:260 ../lib/modules/posixAccount.inc:385
 msgid "Host name"
 msgstr "Hostname"
 
@@ -1908,7 +1914,7 @@ msgstr ""
 msgid "Host name in use. Selected next free host name."
 msgstr "Hostname wird bereits verwendet. Nächster freier Hostname wurde ausgewählt."
 
-#: ../lib/modules/posixAccount.inc:386
+#: ../lib/modules/account.inc:80 ../lib/modules/posixAccount.inc:386
 msgid ""
 "Host name of the host which should be created. Valid characters are: a-z,0-"
 "9, .-_$. LAM does not allow a number as first character because useradd also "
@@ -1930,7 +1936,7 @@ msgid "Hosts"
 msgstr "Hosts"
 
 #: ../lib/modules/posixGroup.inc:457 ../lib/modules/posixGroup.inc:565
-#: ../lib/modules/posixAccount.inc:66 ../lib/modules/posixAccount.inc:634
+#: ../lib/modules/posixAccount.inc:66 ../lib/modules/posixAccount.inc:638
 msgid "ID is already in use"
 msgstr "ID wird bereits verwendet"
 
@@ -1938,7 +1944,7 @@ msgstr "ID wird bereits verwendet"
 #: ../lib/modules/posixGroup.inc:457 ../lib/modules/posixGroup.inc:557
 #: ../lib/modules/posixGroup.inc:565 ../lib/modules/posixAccount.inc:64
 #: ../lib/modules/posixAccount.inc:65 ../lib/modules/posixAccount.inc:66
-#: ../lib/modules/posixAccount.inc:630 ../lib/modules/posixAccount.inc:634
+#: ../lib/modules/posixAccount.inc:634 ../lib/modules/posixAccount.inc:638
 msgid "ID-Number"
 msgstr "ID-Nummer"
 
@@ -1959,7 +1965,7 @@ msgstr ""
 "Falls angekreuzt wird der Account deaktiviert (es wird ein \"!\" vor das "
 "verschlüsselte Passwort gesetzt)."
 
-#: ../lib/modules/sambaAccount.inc:368 ../lib/modules/sambaSamAccount.inc:212
+#: ../lib/modules/sambaAccount.inc:368
 msgid "If checked account will be deactivated. (Setting D-Flag)"
 msgstr "Falls angekreuzt wird der Account deaktiviert. (D-Flag wird gesetzt)"
 
@@ -1971,6 +1977,17 @@ msgstr "Falls angekreuzt wird kein Passwort verwendet."
 msgid "If checked password does not expire. (Setting X-Flag)"
 msgstr "Falls angekreuzt läuft das Passwort nicht aus. (X-Flag wird gesetzt)"
 
+#: ../lib/modules/sambaSamAccount.inc:212
+msgid "If checked then the account will be deactivated. (Setting D-Flag)"
+msgstr "Falls angekreuzt wird der Account deaktiviert. (D-Flag wird gesetzt)"
+
+#: ../lib/modules/sambaSamAccount.inc:215
+msgid ""
+"If checked then the account will be locked (setting L-Flag). You usually "
+"want to use this setting to unlock user accounts which were locked because "
+"of failed login attempts."
+msgstr "Falls angekreuzt, wird der Account gesperrt (L-Flag wird gesetzt). Sie können diese Einstellung verwenden, um durch falsche Passworteingaben gesperrte Accounts zu entsperren."
+
 #: ../lib/modules/posixGroup.inc:371
 msgid ""
 "If empty GID number will be generated automaticly depending on your "
@@ -1993,7 +2010,7 @@ msgstr ""
 "Falls auf \"true\" gesetzt wird das Unix-Passwort auch als Samba-Passwort "
 "verwendet."
 
-#: ../lib/modules/sambaAccount.inc:371 ../lib/modules/sambaSamAccount.inc:215
+#: ../lib/modules/sambaAccount.inc:371 ../lib/modules/sambaSamAccount.inc:218
 msgid "If set to \"true\" account will be deactivated. (Setting D-Flag)"
 msgstr ""
 "Falls auf \"true\" gesetzt wird der Account deaktiviert. (D-Flag wird "
@@ -2009,7 +2026,7 @@ msgstr ""
 "Falls auf \"true\" gesetzt läuft das Passwort nicht aus. (X-Flag wird "
 "gesetzt)"
 
-#: ../lib/modules/sambaSamAccount.inc:251
+#: ../lib/modules/sambaSamAccount.inc:254
 msgid "If you leave this empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
 msgstr ""
 "Wenn Sie das Feld leer lassen wird LAM folgenden Wert einfügen: uidNumber*2 "
@@ -2119,7 +2136,7 @@ msgstr "Einladungsregeln"
 msgid "Invitation policy list"
 msgstr "Liste der Einladungsregeln"
 
-#: ../lib/modules/sambaSamAccount.inc:441
+#: ../lib/modules/sambaSamAccount.inc:444
 msgid "Islamabad, Karachi"
 msgstr "Islamabad, Karachi"
 
@@ -2212,7 +2229,7 @@ msgstr "LAM konnte keine Domäne mit diesem Namen finden!"
 msgid "LAM was unable to find a group with this name!"
 msgstr "LAM konnte keine Gruppe mit diesem Namen finden!"
 
-#: ../lib/modules/posixAccount.inc:1408
+#: ../lib/modules/posixAccount.inc:1412
 #, php-format
 msgid "LAM was unable to modify group memberships for group: %s"
 msgstr "LAM konnte die Gruppenzugehörigkeiten für Gruppe %s nicht ändern."
@@ -2236,7 +2253,7 @@ msgid "LDAP"
 msgstr "LDAP"
 
 #: ../templates/config/confmodules.php:76 ../templates/config/confmain.php:120
-#: ../templates/config/confmain.php:501 ../templates/config/conftypes.php:154
+#: ../templates/config/confmain.php:509 ../templates/config/conftypes.php:154
 #: ../templates/selfService/adminMain.php:107
 msgid "LDAP Account Manager Configuration"
 msgstr "LDAP Account Manager Einstellungen"
@@ -2331,7 +2348,7 @@ msgstr "Lamdaemon: Quotas lesen"
 msgid "Language"
 msgstr "Sprache"
 
-#: ../templates/config/confmain.php:440
+#: ../templates/config/confmain.php:448
 msgid "Language is not defined!"
 msgstr "Sprache ist nicht definiert!"
 
@@ -2374,7 +2391,7 @@ msgstr "Attribute der Listen"
 msgid "List attributes are invalid!"
 msgstr "Attribute der Liste sind ungültig!"
 
-#: ../lib/modules/sambaAccount.inc:391 ../lib/modules/sambaSamAccount.inc:235
+#: ../lib/modules/sambaAccount.inc:391 ../lib/modules/sambaSamAccount.inc:238
 msgid ""
 "List of Samba workstations the user is allowed to login. Empty means every "
 "workstation."
@@ -2382,7 +2399,7 @@ msgstr ""
 "Liste der Samba-Arbeitsstationen, auf welchen sich der Benutzer anmelden "
 "darf. Leer heißt jede Arbeitsstation."
 
-#: ../templates/config/confmain.php:431
+#: ../templates/config/confmain.php:439
 msgid "List of admin users is empty or invalid!"
 msgstr "Liste der berechtigten Benutzer ist ungültig!"
 
@@ -2390,7 +2407,7 @@ msgstr "Liste der berechtigten Benutzer ist ungültig!"
 msgid "List of entries to be deleted:"
 msgstr "Liste der zu löschenden Einträge:"
 
-#: ../templates/config/confmain.php:348
+#: ../templates/config/confmain.php:349
 msgid "List of valid users"
 msgstr "Liste der berechtigten Benutzer"
 
@@ -2418,7 +2435,7 @@ msgid "Local group"
 msgstr "Lokale Gruppe"
 
 #: ../lib/modules/posixGroup.inc:170 ../lib/modules/posixAccount.inc:241
-#: ../lib/modules/posixAccount.inc:856
+#: ../lib/modules/posixAccount.inc:860
 msgid "Lock password"
 msgstr "Passwort deaktivieren"
 
@@ -2465,8 +2482,8 @@ msgid "Login caption"
 msgstr "Login-Überschrift"
 
 #: ../lib/types/user.inc:90 ../lib/modules/posixAccount.inc:227
-#: ../lib/modules/posixAccount.inc:371 ../lib/modules/posixAccount.inc:875
-#: ../lib/modules/posixAccount.inc:984 ../lib/modules/posixAccount.inc:1035
+#: ../lib/modules/posixAccount.inc:371 ../lib/modules/posixAccount.inc:879
+#: ../lib/modules/posixAccount.inc:988 ../lib/modules/posixAccount.inc:1039
 msgid "Login shell"
 msgstr "Login Shell"
 
@@ -2480,11 +2497,11 @@ msgid "Logon for password change"
 msgstr "Anmeldung für Passwortänderung"
 
 #: ../lib/modules/sambaSamAccount.inc:103
-#: ../lib/modules/sambaSamAccount.inc:259
 #: ../lib/modules/sambaSamAccount.inc:262
-#: ../lib/modules/sambaSamAccount.inc:394
-#: ../lib/modules/sambaSamAccount.inc:990
-#: ../lib/modules/sambaSamAccount.inc:1255
+#: ../lib/modules/sambaSamAccount.inc:265
+#: ../lib/modules/sambaSamAccount.inc:397
+#: ../lib/modules/sambaSamAccount.inc:1001
+#: ../lib/modules/sambaSamAccount.inc:1266
 msgid "Logon hours"
 msgstr "Anmeldezeiten"
 
@@ -2493,11 +2510,11 @@ msgstr "Anmeldezeiten"
 #: ../lib/modules/sambaAccount.inc:387 ../lib/modules/sambaAccount.inc:764
 #: ../lib/modules/sambaAccount.inc:857 ../lib/modules/sambaSamAccount.inc:82
 #: ../lib/modules/sambaSamAccount.inc:83
-#: ../lib/modules/sambaSamAccount.inc:231
-#: ../lib/modules/sambaSamAccount.inc:368
-#: ../lib/modules/sambaSamAccount.inc:943
-#: ../lib/modules/sambaSamAccount.inc:1221
-#: ../lib/modules/sambaSamAccount.inc:1377
+#: ../lib/modules/sambaSamAccount.inc:234
+#: ../lib/modules/sambaSamAccount.inc:371
+#: ../lib/modules/sambaSamAccount.inc:954
+#: ../lib/modules/sambaSamAccount.inc:1232
+#: ../lib/modules/sambaSamAccount.inc:1388
 msgid "Logon script"
 msgstr "Anmeldeskript"
 
@@ -2524,7 +2541,7 @@ msgstr "Liste von MAC-Adressen"
 msgid "MAC address(es)"
 msgstr "MAC-Adresse(n)"
 
-#: ../lib/modules/sambaSamAccount.inc:447
+#: ../lib/modules/sambaSamAccount.inc:450
 msgid "Magadan, Solomon Islands"
 msgstr "Magadan, Solomon-Inseln"
 
@@ -2641,7 +2658,7 @@ msgstr "Matching-Regel OID"
 msgid "Matching rules"
 msgstr "Matching-Regeln"
 
-#: ../templates/config/confmain.php:437
+#: ../templates/config/confmain.php:445
 msgid "Max list entries is invalid!"
 msgstr "Maximale Listeneinträge ist ungültig!"
 
@@ -2700,11 +2717,11 @@ msgstr "Maximales Passwortalter"
 msgid "Members"
 msgstr "Mitglieder"
 
-#: ../lib/modules/sambaSamAccount.inc:434
+#: ../lib/modules/sambaSamAccount.inc:437
 msgid "Mid-Atlantic"
 msgstr "Mittelatlantik"
 
-#: ../lib/modules/sambaSamAccount.inc:425
+#: ../lib/modules/sambaSamAccount.inc:428
 msgid "Midway Island, Samoa"
 msgstr "Midway Island, Samoa"
 
@@ -2761,11 +2778,11 @@ msgstr "Account ändern"
 msgid "Module selection"
 msgstr "Modulauswahl"
 
-#: ../lib/modules/sambaSamAccount.inc:1047
+#: ../lib/modules/sambaSamAccount.inc:1058
 msgid "Monday"
 msgstr "Montag"
 
-#: ../lib/modules/sambaSamAccount.inc:429
+#: ../lib/modules/sambaSamAccount.inc:432
 msgid "Mountain Time (US & Canada)"
 msgstr "Mountain Time (USA & Kanada)"
 
@@ -2859,7 +2876,7 @@ msgstr "Neue Organizational Unit"
 msgid "New owner"
 msgstr "Neuer Besitzer"
 
-#: ../templates/config/confmain.php:361 ../lib/modules/posixAccount.inc:1516
+#: ../templates/config/confmain.php:362 ../lib/modules/posixAccount.inc:1520
 msgid "New password"
 msgstr "Neues Passwort"
 
@@ -2933,17 +2950,17 @@ msgstr "Nächste Benutzer-RID ist keine Zahl!"
 msgid "No"
 msgstr "Nein"
 
-#: ../lib/modules/sambaSamAccount.inc:471
-#: ../lib/modules/sambaSamAccount.inc:555
-#: ../lib/modules/sambaSamAccount.inc:832
+#: ../lib/modules/sambaSamAccount.inc:474
+#: ../lib/modules/sambaSamAccount.inc:558
+#: ../lib/modules/sambaSamAccount.inc:836
 #: ../lib/modules/sambaGroupMapping.inc:88
 #: ../lib/modules/sambaGroupMapping.inc:173
 #: ../lib/modules/sambaGroupMapping.inc:408
 msgid "No Samba 3 domains found in LDAP! Please create one first."
 msgstr "Keine Samba 3 Domänen gefunden, bitte erstellen Sie eine."
 
-#: ../lib/modules/posixAccount.inc:415 ../lib/modules/posixAccount.inc:536
-#: ../lib/modules/posixAccount.inc:808
+#: ../lib/modules/posixAccount.inc:419 ../lib/modules/posixAccount.inc:540
+#: ../lib/modules/posixAccount.inc:812
 msgid "No Unix groups found in LDAP! Please create one first."
 msgstr "Keine Unix-Gruppen gefunden, bitte erstellen Sie eine."
 
@@ -3151,7 +3168,7 @@ msgstr "Aus"
 #: ../templates/config/mainmanage.php:325
 #: ../templates/config/confmodules.php:109
 #: ../templates/config/confmodules.php:112
-#: ../templates/config/confmain.php:384 ../templates/config/conftypes.php:235
+#: ../templates/config/confmain.php:385 ../templates/config/conftypes.php:235
 #: ../templates/config/conflogin.php:124 ../templates/config/conflogin.php:125
 #: ../templates/config/mainlogin.php:117
 #: ../templates/selfService/selfServiceLogin.php:204
@@ -3164,7 +3181,7 @@ msgstr "Aus"
 #: ../templates/pdfedit/pdfmain.php:152
 #: ../templates/profedit/profiledelete.php:82
 #: ../templates/profedit/profilemain.php:165 ../lib/modules/posixGroup.inc:260
-#: ../lib/modules/sambaSamAccount.inc:1094 ../lib/modules/posixAccount.inc:954
+#: ../lib/modules/sambaSamAccount.inc:1105 ../lib/modules/posixAccount.inc:958
 #: ../lib/modules/inetOrgPerson.inc:760 ../lib/modules/groupOfNames.inc:224
 #: ../lib/modules/groupOfNames.inc:251 ../lib/modules/groupOfNames.inc:338
 msgid "Ok"
@@ -3228,7 +3245,7 @@ msgstr "PDF-Strukturen"
 msgid "PDF-structure name not valid"
 msgstr "PDF-Strukturname ist nicht gültig"
 
-#: ../lib/modules/sambaSamAccount.inc:428
+#: ../lib/modules/sambaSamAccount.inc:431
 msgid "Pacific Time (US & Canada)"
 msgstr "Pacific Time (USA & Kanada)"
 
@@ -3247,11 +3264,11 @@ msgstr "Elter von"
 #: ../lib/modules/posixGroup.inc:453 ../lib/modules/sambaAccount.inc:74
 #: ../lib/modules/sambaAccount.inc:75 ../lib/modules/sambaAccount.inc:225
 #: ../lib/modules/sambaSamAccount.inc:87 ../lib/modules/sambaSamAccount.inc:88
-#: ../lib/modules/sambaSamAccount.inc:291 ../lib/modules/posixAccount.inc:69
+#: ../lib/modules/sambaSamAccount.inc:294 ../lib/modules/posixAccount.inc:69
 #: ../lib/modules/posixAccount.inc:70 ../lib/modules/posixAccount.inc:130
 #: ../lib/modules/posixAccount.inc:235 ../lib/modules/posixAccount.inc:363
-#: ../lib/modules/posixAccount.inc:851 ../lib/modules/posixAccount.inc:862
-#: ../lib/modules/posixAccount.inc:945 ../lib/modules/posixAccount.inc:1038
+#: ../lib/modules/posixAccount.inc:855 ../lib/modules/posixAccount.inc:866
+#: ../lib/modules/posixAccount.inc:949 ../lib/modules/posixAccount.inc:1042
 #: ../lib/modules/inetOrgPerson.inc:74 ../lib/modules/inetOrgPerson.inc:75
 #: ../lib/modules/inetOrgPerson.inc:356 ../lib/modules/inetOrgPerson.inc:589
 #: ../lib/modules/inetOrgPerson.inc:600 ../lib/modules/inetOrgPerson.inc:751
@@ -3274,9 +3291,9 @@ msgstr ""
 #: ../lib/modules/sambaAccount.inc:361 ../lib/modules/sambaAccount.inc:364
 #: ../lib/modules/sambaAccount.inc:729 ../lib/modules/sambaSamAccount.inc:205
 #: ../lib/modules/sambaSamAccount.inc:208
-#: ../lib/modules/sambaSamAccount.inc:313
-#: ../lib/modules/sambaSamAccount.inc:884
-#: ../lib/modules/sambaSamAccount.inc:1184
+#: ../lib/modules/sambaSamAccount.inc:316
+#: ../lib/modules/sambaSamAccount.inc:888
+#: ../lib/modules/sambaSamAccount.inc:1195
 msgid "Password does not expire"
 msgstr "Passwort läuft nicht ab"
 
@@ -3326,11 +3343,11 @@ msgstr "Passwortwarnung"
 msgid "Password warning must be are natural number."
 msgstr "Passwortwarnung muss eine natürliche Zahl sein."
 
-#: ../templates/config/confmain.php:451
+#: ../templates/config/confmain.php:459
 msgid "Passwords are different!"
 msgstr "Die Passwörter stimmen nicht überein!"
 
-#: ../lib/modules/sambaAccount.inc:385 ../lib/modules/sambaSamAccount.inc:229
+#: ../lib/modules/sambaAccount.inc:385 ../lib/modules/sambaSamAccount.inc:232
 msgid ""
 "Path of the user profile. Can be a local absolute path or a UNC-path (\\"
 "\\server\\share). $user and $group are replaced with user and group name."
@@ -3463,7 +3480,7 @@ msgstr "Bitte geben Sie einen gültigen Straßennamen ein!"
 msgid "Please enter a valid telephone number!"
 msgstr "Bitte geben Sie eine gültige Telefonnummer ein!"
 
-#: ../lib/modules/posixGroup.inc:557 ../lib/modules/posixAccount.inc:630
+#: ../lib/modules/posixGroup.inc:557 ../lib/modules/posixAccount.inc:634
 #, php-format
 msgid "Please enter a value between %s and %s!"
 msgstr "Bitte geben Sie einen Wert zwischen %s und %s ein!"
@@ -3660,8 +3677,8 @@ msgstr "Präsident"
 #: ../lib/modules/posixGroup.inc:467 ../lib/modules/posixAccount.inc:207
 #: ../lib/modules/posixAccount.inc:274 ../lib/modules/posixAccount.inc:330
 #: ../lib/modules/posixAccount.inc:355 ../lib/modules/posixAccount.inc:393
-#: ../lib/modules/posixAccount.inc:830 ../lib/modules/posixAccount.inc:971
-#: ../lib/modules/posixAccount.inc:991 ../lib/modules/posixAccount.inc:1032
+#: ../lib/modules/posixAccount.inc:834 ../lib/modules/posixAccount.inc:975
+#: ../lib/modules/posixAccount.inc:995 ../lib/modules/posixAccount.inc:1036
 msgid "Primary group"
 msgstr "Primäre Gruppe"
 
@@ -3713,11 +3730,11 @@ msgstr "Die Passwörter stimmen nicht überein!"
 #: ../lib/modules/sambaAccount.inc:384 ../lib/modules/sambaAccount.inc:761
 #: ../lib/modules/sambaAccount.inc:858 ../lib/modules/sambaSamAccount.inc:79
 #: ../lib/modules/sambaSamAccount.inc:80
-#: ../lib/modules/sambaSamAccount.inc:228
-#: ../lib/modules/sambaSamAccount.inc:362
-#: ../lib/modules/sambaSamAccount.inc:940
-#: ../lib/modules/sambaSamAccount.inc:1215
-#: ../lib/modules/sambaSamAccount.inc:1378
+#: ../lib/modules/sambaSamAccount.inc:231
+#: ../lib/modules/sambaSamAccount.inc:365
+#: ../lib/modules/sambaSamAccount.inc:951
+#: ../lib/modules/sambaSamAccount.inc:1226
+#: ../lib/modules/sambaSamAccount.inc:1389
 msgid "Profile path"
 msgstr "Profilpfad"
 
@@ -3786,7 +3803,7 @@ msgstr "Fortschritt des Löschvorgangs"
 msgid "Reenter new master password"
 msgstr "Neues Hauptpasswort erneut eingeben"
 
-#: ../templates/config/confmain.php:371 ../lib/modules/posixAccount.inc:1518
+#: ../templates/config/confmain.php:372 ../lib/modules/posixAccount.inc:1522
 msgid "Reenter password"
 msgstr "Passwort nochmal eingeben"
 
@@ -3809,7 +3826,7 @@ msgid "Relative distinguished name"
 msgstr "Relativer eindeutiger Name"
 
 #: ../templates/pdfedit/pdfpage.php:475 ../lib/modules/ieee802device.inc:99
-#: ../lib/modules/sambaSamAccount.inc:1142 ../lib/modules/kolabUser.inc:337
+#: ../lib/modules/sambaSamAccount.inc:1153 ../lib/modules/kolabUser.inc:337
 #: ../lib/modules/kolabUser.inc:356 ../lib/modules/kolabUser.inc:382
 #: ../lib/modules/shadowAccount.inc:345 ../lib/modules/ldapPublicKey.inc:92
 #: ../lib/modules/inetLocalMailRecipient.inc:154
@@ -3817,7 +3834,7 @@ msgstr "Relativer eindeutiger Name"
 msgid "Remove"
 msgstr "Löschen"
 
-#: ../lib/modules/posixGroup.inc:184 ../lib/modules/posixAccount.inc:869
+#: ../lib/modules/posixGroup.inc:184 ../lib/modules/posixAccount.inc:873
 msgid "Remove password"
 msgstr "Passwort entfernen"
 
@@ -3840,12 +3857,12 @@ msgid "Renamed profile."
 msgstr "Profil umbenannt."
 
 #: ../lib/modules/posixGroup.inc:255 ../lib/modules/sambaAccount.inc:718
-#: ../lib/modules/sambaSamAccount.inc:874 ../lib/modules/posixAccount.inc:949
+#: ../lib/modules/sambaSamAccount.inc:878 ../lib/modules/posixAccount.inc:953
 #: ../lib/modules/inetOrgPerson.inc:593 ../lib/modules/inetOrgPerson.inc:755
 msgid "Repeat password"
 msgstr "Passwort wiederholen"
 
-#: ../lib/modules/posixAccount.inc:61 ../lib/modules/posixAccount.inc:652
+#: ../lib/modules/posixAccount.inc:61 ../lib/modules/posixAccount.inc:656
 msgid "Replaced $user or $group in homedir."
 msgstr "$user und $group wurden im Heimatverzeichnis ersetzt."
 
@@ -3860,7 +3877,7 @@ msgid "Required attributes"
 msgstr "Vorgeschriebene Attribute"
 
 #: ../templates/profedit/profilepage.php:251
-#: ../lib/modules/sambaAccount.inc:809 ../lib/modules/sambaSamAccount.inc:998
+#: ../lib/modules/sambaAccount.inc:809 ../lib/modules/sambaSamAccount.inc:1009
 msgid "Reset"
 msgstr "Zurücksetzen"
 
@@ -3870,7 +3887,7 @@ msgstr "Änderungen zurücksetzen"
 
 #: ../lib/modules/sambaAccount.inc:346 ../lib/modules/sambaAccount.inc:808
 #: ../lib/modules/sambaSamAccount.inc:190
-#: ../lib/modules/sambaSamAccount.inc:997
+#: ../lib/modules/sambaSamAccount.inc:1008
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
@@ -3933,10 +3950,10 @@ msgstr "Samba 3 Domänen-SID ist ungültig!"
 msgid "Samba 3 domain entries"
 msgstr "Samba 3 Domäneneinträge"
 
-#: ../lib/modules/sambaSamAccount.inc:249
-#: ../lib/modules/sambaSamAccount.inc:253
-#: ../lib/modules/sambaSamAccount.inc:387
-#: ../lib/modules/sambaSamAccount.inc:411
+#: ../lib/modules/sambaSamAccount.inc:252
+#: ../lib/modules/sambaSamAccount.inc:256
+#: ../lib/modules/sambaSamAccount.inc:390
+#: ../lib/modules/sambaSamAccount.inc:414
 msgid "Samba RID"
 msgstr "Samba-RID"
 
@@ -3969,7 +3986,7 @@ msgstr "Samba-Gruppentyp"
 
 #: ../lib/modules/sambaAccount.inc:343 ../lib/modules/sambaAccount.inc:715
 #: ../lib/modules/sambaSamAccount.inc:187
-#: ../lib/modules/sambaSamAccount.inc:870
+#: ../lib/modules/sambaSamAccount.inc:874
 msgid "Samba password"
 msgstr "Samba-Passwort"
 
@@ -3977,16 +3994,16 @@ msgstr "Samba-Passwort"
 #: ../lib/modules/sambaAccount.inc:301 ../lib/modules/sambaAccount.inc:390
 #: ../lib/modules/sambaAccount.inc:393 ../lib/modules/sambaAccount.inc:767
 #: ../lib/modules/sambaAccount.inc:859 ../lib/modules/sambaSamAccount.inc:85
-#: ../lib/modules/sambaSamAccount.inc:234
 #: ../lib/modules/sambaSamAccount.inc:237
-#: ../lib/modules/sambaSamAccount.inc:374
-#: ../lib/modules/sambaSamAccount.inc:946
-#: ../lib/modules/sambaSamAccount.inc:1227
-#: ../lib/modules/sambaSamAccount.inc:1379
+#: ../lib/modules/sambaSamAccount.inc:240
+#: ../lib/modules/sambaSamAccount.inc:377
+#: ../lib/modules/sambaSamAccount.inc:957
+#: ../lib/modules/sambaSamAccount.inc:1238
+#: ../lib/modules/sambaSamAccount.inc:1390
 msgid "Samba workstations"
 msgstr "Samba PCs"
 
-#: ../lib/modules/sambaSamAccount.inc:1048
+#: ../lib/modules/sambaSamAccount.inc:1059
 msgid "Saturday"
 msgstr "Samstag"
 
@@ -4017,7 +4034,7 @@ msgstr "Typ"
 msgid "Script path"
 msgstr "Scriptpfad"
 
-#: ../templates/config/confmain.php:443
+#: ../templates/config/confmain.php:451
 msgid "Script path is invalid!"
 msgstr "Scriptpfad ist ungültig!"
 
@@ -4025,7 +4042,7 @@ msgstr "Scriptpfad ist ungültig!"
 msgid "Script server"
 msgstr "Scriptserver"
 
-#: ../templates/config/confmain.php:446
+#: ../templates/config/confmain.php:454
 msgid "Script server is invalid!"
 msgstr "Scriptserver ist ungültig!"
 
@@ -4067,7 +4084,7 @@ msgstr "Wählen Sie eine Vorlage für den Anlegevorgang"
 msgid "Select all"
 msgstr "Alle auswählen"
 
-#: ../lib/modules/posixAccount.inc:916
+#: ../lib/modules/posixAccount.inc:920
 msgid "Selected groups"
 msgstr "Gewählte Gruppen"
 
@@ -4092,7 +4109,7 @@ msgstr "SelfService-Einstellungsassistent"
 msgid "Server address"
 msgstr "Serveraddresse"
 
-#: ../templates/config/confmain.php:425
+#: ../templates/config/confmain.php:426
 #: ../templates/selfService/adminMain.php:60
 msgid "Server address is invalid!"
 msgstr "Die Server-Adresse ist ungültig!"
@@ -4114,7 +4131,7 @@ msgstr "Servereinstellungen"
 msgid "Session timeout"
 msgstr "Zeitbeschränkung für Sitzung"
 
-#: ../lib/modules/posixGroup.inc:166 ../lib/modules/posixAccount.inc:852
+#: ../lib/modules/posixGroup.inc:166 ../lib/modules/posixAccount.inc:856
 msgid "Set password"
 msgstr "Passwort setzen"
 
@@ -4192,8 +4209,8 @@ msgid "Sorry this help number ({bold}%d{endbold}) is not available."
 msgstr "Diese Hilfenummer ist leider nicht verfügbar: {bold}%d{endbold}"
 
 #: ../lib/modules/sambaAccount.inc:314 ../lib/modules/sambaAccount.inc:402
-#: ../lib/modules/sambaAccount.inc:799 ../lib/modules/sambaSamAccount.inc:246
-#: ../lib/modules/sambaSamAccount.inc:981
+#: ../lib/modules/sambaAccount.inc:799 ../lib/modules/sambaSamAccount.inc:249
+#: ../lib/modules/sambaSamAccount.inc:992
 msgid "Special user"
 msgstr "Spezieller Benutzer"
 
@@ -4214,7 +4231,7 @@ msgstr "Schritt 2 von 2: Attribute und Werte"
 msgid "Steve"
 msgstr "Hans"
 
-#: ../lib/modules/sambaAccount.inc:221 ../lib/modules/sambaSamAccount.inc:287
+#: ../lib/modules/sambaAccount.inc:221 ../lib/modules/sambaSamAccount.inc:290
 #: ../lib/modules/posixAccount.inc:197 ../lib/modules/inetOrgPerson.inc:237
 msgid "Steve Miller"
 msgstr "Hans Müller"
@@ -4254,7 +4271,7 @@ msgstr "Sudo ist nicht korrekt eingerichtet!"
 msgid "Suffix"
 msgstr "Suffix"
 
-#: ../lib/modules/sambaSamAccount.inc:1048
+#: ../lib/modules/sambaSamAccount.inc:1059
 msgid "Sunday"
 msgstr "Sonntag"
 
@@ -4488,7 +4505,7 @@ msgstr ""
 msgid "This account is marked for deletion."
 msgstr "Dieser Account wurde zum Löschen markiert."
 
-#: ../lib/modules/sambaSamAccount.inc:247
+#: ../lib/modules/sambaSamAccount.inc:250
 msgid ""
 "This allows you to define this account as a special user like administrator "
 "or guest."
@@ -4573,16 +4590,17 @@ msgstr "Dies ist eine Liste von Mitgliedern dieser Gruppe."
 msgid ""
 "This is a list of members of this group. Multiple members are separated by "
 "semicolons."
-msgstr "Dies ist eine Liste von Mitgliedern dieser Gruppe. Mehrere Einträge werden durch Strichpunkte getrennt."
+msgstr ""
+"Dies ist eine Liste von Mitgliedern dieser Gruppe. Mehrere Einträge werden "
+"durch Strichpunkte getrennt."
 
 #: ../help/help.inc:88
 msgid ""
 "This is a list of valid DN entries of all users that are allowed to login to "
-"LDAP Account Manager. The user names have to be separated by semicolons."
+"LDAP Account Manager. Please enter one DN per line."
 msgstr ""
 "Das ist eine Liste von DN-Einträgen aller Benutzer, die sich bei LDAP "
-"Account Manager anmelden dürfen. Die Benutzernamen müssen mit Strichpunkten "
-"getrennt sein."
+"Account Manager anmelden dürfen. Bitte geben Sie pro Zeile einen DN an."
 
 #: ../templates/masscreate.php:219
 msgid ""
@@ -4640,7 +4658,7 @@ msgstr "Dies ist die MAC-Adresse der Netzwerkkarte im Gerät (z.B. 00:01:02:DE:E
 msgid "This is the RID of the user's primary Windows group."
 msgstr "Das ist die RID-Nummer der primären Gruppe des Benutzers."
 
-#: ../lib/modules/sambaSamAccount.inc:244
+#: ../lib/modules/sambaSamAccount.inc:247
 msgid "This is the SID of the user's primary Windows group."
 msgstr "Das ist die SID der primären Gruppe des Benutzers."
 
@@ -4660,7 +4678,7 @@ msgstr "Das ist das Windows-Passwort für den Account."
 msgid "This is the account's full name on Windows systems."
 msgstr "Das ist der Name, der auf Windows-Systemen angezeigt wird."
 
-#: ../lib/modules/sambaSamAccount.inc:266 ../lib/modules/shadowAccount.inc:170
+#: ../lib/modules/sambaSamAccount.inc:269 ../lib/modules/shadowAccount.inc:170
 msgid "This is the date when the account will expire. Format: DD-MM-YYYY"
 msgstr "Account-Ablaufdatum im Format: TT-MM-JJJJ"
 
@@ -4682,7 +4700,7 @@ msgstr ""
 msgid ""
 "This is the list of attributes to show in the account list. The entries can "
 "either be predefined values, \"#attribute\", or individual ones, \"attribute:"
-"description\". Several entries are seperated by semicolons."
+"description\". Several entries are separated by semicolons."
 msgstr ""
 "Das ist eine Liste von Attributen, die in den Account-Listen angezeigt wird. "
 "Die Einträge können entweder vordefinierte Werte \"#Wert\" oder eigne Werte "
@@ -4697,6 +4715,12 @@ msgstr "Dies ist der Mailserver des Benutzers."
 msgid "This is the name of this group."
 msgstr "Das ist der Name dieser Gruppe."
 
+#: ../lib/modules/posixAccount.inc:402
+msgid "This is the natural name of the host. If empty, the host name will be used."
+msgstr ""
+"Dies ist der übliche Name des Hosts, falls leer wird der Hostname "
+"verwendet."
+
 #: ../lib/modules/inetOrgPerson.inc:345
 msgid ""
 "This is the natural name of the user. If empty, the first and last name is "
@@ -4740,7 +4764,7 @@ msgstr ""
 "Accounts. Wenn Sie das Feld leer lassen wird LAM die RID aus der UID "
 "berechnen. Mögliche Werte sind eine Zahl oder eine spezielle Gruppe:"
 
-#: ../lib/modules/sambaSamAccount.inc:250
+#: ../lib/modules/sambaSamAccount.inc:253
 msgid ""
 "This is the relative ID number for your Windows account. You can either "
 "enter a number or one of these special accounts: "
@@ -4748,7 +4772,7 @@ msgstr ""
 "Das ist die relative ID-Nummer für den Windows-Account. Sie können entweder "
 "eine Nummer angeben oder den Namen eines dieser Spezialaccounts: "
 
-#: ../lib/modules/sambaSamAccount.inc:254
+#: ../lib/modules/sambaSamAccount.inc:257
 msgid ""
 "This is the relative ID number for your host account. If you leave this "
 "empty LAM will use: uidNumber*2 + sambaAlgorithmicRidBase."
@@ -4829,7 +4853,7 @@ msgstr ""
 "Termine abfragen möchten. Wenn Sie das Feld leer lassen wird der "
 "Standardwert (60 Tage) verwendet."
 
-#: ../lib/modules/sambaSamAccount.inc:269
+#: ../lib/modules/sambaSamAccount.inc:272
 msgid ""
 "This is the time zone of your Samba server. LAM needs this information to "
 "display the logon hours correctly."
@@ -4837,7 +4861,7 @@ msgstr ""
 "Hier können Sie die Zeitzone Ihres Samba-Servers einstellen. LAM benötigt "
 "die Information zur korrekten Darstellung der Anmeldezeiten."
 
-#: ../lib/modules/sambaSamAccount.inc:241
+#: ../lib/modules/sambaSamAccount.inc:244
 msgid "This is the user's primary Windows group."
 msgstr "Das ist die primäre Windows-Gruppe des Benutzers."
 
@@ -4853,11 +4877,11 @@ msgstr "Diese Mailadresse wird bereits verwendet:"
 msgid "This object class is obsolete."
 msgstr "Diese Objektklasse ist veraltet."
 
-#: ../lib/modules/sambaSamAccount.inc:260
+#: ../lib/modules/sambaSamAccount.inc:263
 msgid "This option defines the allowed logon hours for this account."
 msgstr "Diese Einstellung dient zur Zuweisung der erlaubten Anmeldezeiten."
 
-#: ../lib/modules/sambaSamAccount.inc:263
+#: ../lib/modules/sambaSamAccount.inc:266
 msgid ""
 "This option defines the allowed logon hours for this account. The format is "
 "the same as for the LDAP attribute. The 24*7 hours are represented as 168 "
@@ -4949,16 +4973,16 @@ msgstr ""
 "Damit wird der Account für Kolabd als löschbar gekennzeichnet. Verwenden Sie "
 "dies um Kolab-Accounts sauber zu löschen (löscht z.B. das Postfach)."
 
-#: ../lib/modules/sambaSamAccount.inc:1047
+#: ../lib/modules/sambaSamAccount.inc:1058
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../lib/modules/sambaSamAccount.inc:1088
+#: ../lib/modules/sambaSamAccount.inc:1099
 msgid "Time"
 msgstr "Zeit"
 
-#: ../lib/modules/sambaSamAccount.inc:268
-#: ../lib/modules/sambaSamAccount.inc:421
+#: ../lib/modules/sambaSamAccount.inc:271
+#: ../lib/modules/sambaSamAccount.inc:424
 msgid "Time zone"
 msgstr "Zeitzone"
 
@@ -4976,7 +5000,7 @@ msgstr ""
 "Verwenden Sie /bin/false um den Login zu deaktivieren. Die Shellliste wird "
 "von lam/config/shells gelesen."
 
-#: ../lib/modules/sambaSamAccount.inc:445
+#: ../lib/modules/sambaSamAccount.inc:448
 msgid "Tokyo, Seoul, Osaka, Yakutsk"
 msgstr "Tokyo, Seoul, Osaka, Yakutsk"
 
@@ -5000,11 +5024,11 @@ msgstr "Baumansicht"
 msgid "Tree view"
 msgstr "Baumansicht"
 
-#: ../templates/config/confmain.php:434
+#: ../templates/config/confmain.php:442
 msgid "TreeSuffix is invalid!"
 msgstr "BaumSuffix ist ungültig!"
 
-#: ../lib/modules/sambaSamAccount.inc:1047
+#: ../lib/modules/sambaSamAccount.inc:1058
 msgid "Tuesday"
 msgstr "Dienstag"
 
@@ -5033,7 +5057,7 @@ msgstr ""
 #: ../lib/modules/posixAccount.inc:68 ../lib/modules/posixAccount.inc:201
 #: ../lib/modules/posixAccount.inc:268 ../lib/modules/posixAccount.inc:314
 #: ../lib/modules/posixAccount.inc:318 ../lib/modules/posixAccount.inc:326
-#: ../lib/modules/posixAccount.inc:822 ../lib/modules/posixAccount.inc:1029
+#: ../lib/modules/posixAccount.inc:826 ../lib/modules/posixAccount.inc:1033
 msgid "UID number"
 msgstr "UID Nummer"
 
@@ -5051,7 +5075,7 @@ msgstr ""
 msgid "UID ranges for Unix accounts"
 msgstr "UID-Bereiche für Unix-Accounts"
 
-#: ../lib/modules/sambaAccount.inc:382 ../lib/modules/sambaSamAccount.inc:226
+#: ../lib/modules/sambaAccount.inc:382 ../lib/modules/sambaSamAccount.inc:229
 msgid ""
 "UNC-path (\\\\server\\share) of homedirectory. $user and $group are replaced "
 "with user and group name."
@@ -5095,7 +5119,7 @@ msgstr "Kann die PDF-Struktur nicht löschen!"
 msgid "Unable to delete profile!"
 msgstr "Kann das Profil nicht löschen!"
 
-#: ../lib/modules/posixAccount.inc:1208 ../lib/modules/posixAccount.inc:1425
+#: ../lib/modules/posixAccount.inc:1212 ../lib/modules/posixAccount.inc:1429
 msgid "Unable to find group in LDAP."
 msgstr "Kann Gruppe nicht im LDAP-Baum finden."
 
@@ -5145,7 +5169,7 @@ msgstr "Arbeitsstationen"
 msgid "Unix workstations are invalid!"
 msgstr "Unix-Arbeitsstationen sind ungültig!"
 
-#: ../lib/modules/posixGroup.inc:173 ../lib/modules/posixAccount.inc:859
+#: ../lib/modules/posixGroup.inc:173 ../lib/modules/posixAccount.inc:863
 msgid "Unlock password"
 msgstr "Passwort reaktivieren"
 
@@ -5178,9 +5202,9 @@ msgstr "Benutzung"
 #: ../lib/modules/sambaAccount.inc:349 ../lib/modules/sambaAccount.inc:352
 #: ../lib/modules/sambaAccount.inc:722 ../lib/modules/sambaSamAccount.inc:193
 #: ../lib/modules/sambaSamAccount.inc:196
-#: ../lib/modules/sambaSamAccount.inc:297
-#: ../lib/modules/sambaSamAccount.inc:877
-#: ../lib/modules/sambaSamAccount.inc:1166
+#: ../lib/modules/sambaSamAccount.inc:300
+#: ../lib/modules/sambaSamAccount.inc:881
+#: ../lib/modules/sambaSamAccount.inc:1177
 msgid "Use Unix password"
 msgstr "Unix-Passwort verwenden"
 
@@ -5200,9 +5224,9 @@ msgstr ""
 #: ../lib/modules/sambaAccount.inc:355 ../lib/modules/sambaAccount.inc:358
 #: ../lib/modules/sambaAccount.inc:726 ../lib/modules/sambaSamAccount.inc:199
 #: ../lib/modules/sambaSamAccount.inc:202
-#: ../lib/modules/sambaSamAccount.inc:305
-#: ../lib/modules/sambaSamAccount.inc:881
-#: ../lib/modules/sambaSamAccount.inc:1172
+#: ../lib/modules/sambaSamAccount.inc:308
+#: ../lib/modules/sambaSamAccount.inc:885
+#: ../lib/modules/sambaSamAccount.inc:1183
 msgid "Use no password"
 msgstr "Kein Passwort setzen"
 
@@ -5249,10 +5273,10 @@ msgid "User accounts (e.g. Unix, Samba and Kolab)"
 msgstr "Benutzeraccounts (z.B. Unix, Samba und Kolab)"
 
 #: ../lib/modules/sambaAccount.inc:263 ../lib/modules/sambaAccount.inc:373
-#: ../lib/modules/sambaAccount.inc:738 ../lib/modules/sambaSamAccount.inc:217
-#: ../lib/modules/sambaSamAccount.inc:329
-#: ../lib/modules/sambaSamAccount.inc:897
-#: ../lib/modules/sambaSamAccount.inc:1110
+#: ../lib/modules/sambaAccount.inc:738 ../lib/modules/sambaSamAccount.inc:220
+#: ../lib/modules/sambaSamAccount.inc:332
+#: ../lib/modules/sambaSamAccount.inc:908
+#: ../lib/modules/sambaSamAccount.inc:1121
 msgid "User can change password"
 msgstr "Benutzer kann Passwort ändern"
 
@@ -5264,28 +5288,33 @@ msgstr "Benutzerbeschreibung, falls leer wird Vor- und Nachname verwendet."
 msgid "User description. If left empty sur- and give name will be used."
 msgstr "Benutzerbeschreibung, falls leer wird Vor- und Nachname verwendet."
 
+#: ../lib/modules/account.inc:94
+msgid "User description. If left empty user name will be used."
+msgstr "Benutzerbeschreibung. Falls leer wird der Benutzername verwendet."
+
 #: ../templates/schema/schema.php:209
 msgid "User modification"
 msgstr "Vom Benutzer änderbar"
 
 #: ../lib/modules/sambaAccount.inc:270 ../lib/modules/sambaAccount.inc:375
-#: ../lib/modules/sambaAccount.inc:746 ../lib/modules/sambaSamAccount.inc:219
-#: ../lib/modules/sambaSamAccount.inc:336
-#: ../lib/modules/sambaSamAccount.inc:909
-#: ../lib/modules/sambaSamAccount.inc:1115
+#: ../lib/modules/sambaAccount.inc:746 ../lib/modules/sambaSamAccount.inc:222
+#: ../lib/modules/sambaSamAccount.inc:339
+#: ../lib/modules/sambaSamAccount.inc:920
+#: ../lib/modules/sambaSamAccount.inc:1126
 msgid "User must change password"
 msgstr "Benutzer muss Passwort ändern"
 
 #: ../templates/login.php:223 ../lib/types/user.inc:85
-#: ../lib/modules/account.inc:96 ../lib/modules/account.inc:116
-#: ../lib/modules/account.inc:118 ../lib/modules/account.inc:119
-#: ../lib/modules/account.inc:197 ../lib/modules/account.inc:218
-#: ../lib/modules/posixAccount.inc:73 ../lib/modules/posixAccount.inc:74
-#: ../lib/modules/posixAccount.inc:77 ../lib/modules/posixAccount.inc:187
-#: ../lib/modules/posixAccount.inc:347 ../lib/modules/posixAccount.inc:814
-#: ../lib/modules/posixAccount.inc:1027 ../lib/modules/inetOrgPerson.inc:70
-#: ../lib/modules/inetOrgPerson.inc:242 ../lib/modules/inetOrgPerson.inc:348
-#: ../lib/modules/inetOrgPerson.inc:550 ../lib/modules/inetOrgPerson.inc:826
+#: ../lib/modules/account.inc:89 ../lib/modules/account.inc:110
+#: ../lib/modules/account.inc:130 ../lib/modules/account.inc:132
+#: ../lib/modules/account.inc:133 ../lib/modules/account.inc:211
+#: ../lib/modules/account.inc:232 ../lib/modules/posixAccount.inc:73
+#: ../lib/modules/posixAccount.inc:74 ../lib/modules/posixAccount.inc:77
+#: ../lib/modules/posixAccount.inc:187 ../lib/modules/posixAccount.inc:347
+#: ../lib/modules/posixAccount.inc:818 ../lib/modules/posixAccount.inc:1031
+#: ../lib/modules/inetOrgPerson.inc:70 ../lib/modules/inetOrgPerson.inc:242
+#: ../lib/modules/inetOrgPerson.inc:348 ../lib/modules/inetOrgPerson.inc:550
+#: ../lib/modules/inetOrgPerson.inc:826
 msgid "User name"
 msgstr "Benutzername"
 
@@ -5293,8 +5322,8 @@ msgstr "Benutzername"
 msgid "User name already exists!"
 msgstr "Benutzername besteht schon!"
 
-#: ../lib/modules/account.inc:116 ../lib/modules/account.inc:117
-#: ../lib/modules/account.inc:119 ../lib/modules/posixAccount.inc:74
+#: ../lib/modules/account.inc:130 ../lib/modules/account.inc:131
+#: ../lib/modules/account.inc:133 ../lib/modules/posixAccount.inc:74
 #: ../lib/modules/posixAccount.inc:79 ../lib/modules/inetOrgPerson.inc:70
 #: ../lib/modules/inetOrgPerson.inc:71
 msgid ""
@@ -5310,7 +5339,8 @@ msgstr ""
 "Der Benutzername ist bereits vorhanden, der nächste freie Name wurde "
 "ausgewählt."
 
-#: ../lib/modules/posixAccount.inc:348 ../lib/modules/inetOrgPerson.inc:349
+#: ../lib/modules/account.inc:90 ../lib/modules/posixAccount.inc:348
+#: ../lib/modules/inetOrgPerson.inc:349
 msgid ""
 "User name of the user who should be created. Valid characters are: a-z,0-"
 "9, .-_. LAM does not allow a number as first character because useradd also "
@@ -5404,11 +5434,11 @@ msgstr "Konnte die Attribute nicht ändern: %s."
 msgid "Was unable to remove attribtues from DN: %s."
 msgstr "Konnte die Attribute nicht löschen: %s."
 
-#: ../lib/modules/sambaSamAccount.inc:1047
+#: ../lib/modules/sambaSamAccount.inc:1058
 msgid "Wednesday"
 msgstr "Donnerstag"
 
-#: ../lib/modules/sambaSamAccount.inc:436
+#: ../lib/modules/sambaSamAccount.inc:439
 msgid "Western Europe Time, London, Lisbon"
 msgstr "Westeuropäische Zeit, London, Lissabon"
 
@@ -5420,15 +5450,15 @@ msgstr ""
 "Wenn Sie ldaps:// verwenden stellen Sie sicher, dass Sie genau die selbe IP/"
 "Domäne wie in ihrem Zertifikat verwenden!"
 
-#: ../lib/modules/sambaAccount.inc:406 ../lib/modules/sambaSamAccount.inc:257
+#: ../lib/modules/sambaAccount.inc:406 ../lib/modules/sambaSamAccount.inc:260
 msgid "Windows domain name of account."
 msgstr "Windows-Domänenname des Accounts."
 
 #: ../lib/modules/sambaAccount.inc:307 ../lib/modules/sambaAccount.inc:784
-#: ../lib/modules/sambaSamAccount.inc:380
-#: ../lib/modules/sambaSamAccount.inc:963
-#: ../lib/modules/sambaSamAccount.inc:1249
-#: ../lib/modules/sambaSamAccount.inc:1381
+#: ../lib/modules/sambaSamAccount.inc:383
+#: ../lib/modules/sambaSamAccount.inc:974
+#: ../lib/modules/sambaSamAccount.inc:1260
+#: ../lib/modules/sambaSamAccount.inc:1392
 #: ../lib/modules/sambaGroupMapping.inc:205
 #: ../lib/modules/sambaGroupMapping.inc:324
 msgid "Windows group"
@@ -5447,11 +5477,11 @@ msgstr "Windows-Gruppenname"
 msgid "Windows group type."
 msgstr "Windows-Gruppentyp."
 
-#: ../lib/modules/sambaSamAccount.inc:240
+#: ../lib/modules/sambaSamAccount.inc:243
 msgid "Windows primary group"
 msgstr "Primäre Windows-Gruppe"
 
-#: ../lib/modules/sambaSamAccount.inc:243
+#: ../lib/modules/sambaSamAccount.inc:246
 msgid "Windows primary group SID"
 msgstr "Primäre Windows-Gruppen-SID"
 
@@ -5481,7 +5511,7 @@ msgstr ""
 "Sie verwenden Großbuchstaben, das kann Probleme verursachen, da Windows "
 "Groß-/Kleinschreibung nicht unterscheidet."
 
-#: ../lib/modules/account.inc:118 ../lib/modules/posixAccount.inc:73
+#: ../lib/modules/account.inc:132 ../lib/modules/posixAccount.inc:73
 #: ../lib/modules/posixAccount.inc:75
 msgid ""
 "You are using a capital letters. This can cause problems because windows "
@@ -5523,8 +5553,8 @@ msgstr "Sie müssen mindestens ein Mitglied zu dieser Gruppe hinzufügen."
 #, php-format
 msgid "Your LAM admin user (%s) must be a valid Unix account to work with lamdaemon!"
 msgstr ""
-"Ihr LAM-Admin-Benutzer (%s) muss ein gültiger Unix-Account sein um mit Lamdaemon "
-"zu funktionieren!"
+"Ihr LAM-Admin-Benutzer (%s) muss ein gültiger Unix-Account sein um mit "
+"Lamdaemon zu funktionieren!"
 
 #: ../lib/lamdaemon.inc:117 ../lib/lamdaemon.inc:123
 msgid "Your LAM admin user must be a valid Unix account to work with lamdaemon!"
@@ -5560,11 +5590,11 @@ msgstr "Ihre Einstellungen wurden erfolgreich gespeichert."
 msgid "[attribute deleted]"
 msgstr "[Attribut gelöscht]"
 
-#: ../lib/modules/sambaAccount.inc:285 ../lib/modules/sambaSamAccount.inc:358
+#: ../lib/modules/sambaAccount.inc:285 ../lib/modules/sambaSamAccount.inc:361
 msgid "\\\\server\\homes\\smiller"
 msgstr "\\\\server\\homes\\hmueller"
 
-#: ../lib/modules/sambaAccount.inc:291 ../lib/modules/sambaSamAccount.inc:364
+#: ../lib/modules/sambaAccount.inc:291 ../lib/modules/sambaSamAccount.inc:367
 msgid "\\\\server\\profiles\\smiller"
 msgstr "\\\\server\\profile\\hmueller"
 
@@ -5642,12 +5672,12 @@ msgid "machines"
 msgstr "Hosts"
 
 #: ../lib/modules/sambaAccount.inc:323 ../lib/modules/sambaAccount.inc:333
-#: ../lib/modules/sambaSamAccount.inc:281
-#: ../lib/modules/sambaSamAccount.inc:407
+#: ../lib/modules/sambaSamAccount.inc:284
+#: ../lib/modules/sambaSamAccount.inc:410
 msgid "mydomain"
 msgstr "meineDomaene"
 
-#: ../lib/modules/sambaSamAccount.inc:382
+#: ../lib/modules/sambaSamAccount.inc:385
 msgid "mygroup"
 msgstr "meineGruppe"
 
@@ -5693,17 +5723,17 @@ msgstr "pc01,Raum 2.34"
 msgid "pc01,pc02"
 msgstr "pc01,pc02"
 
-#: ../templates/tree/edit.php:242 ../templates/config/confmain.php:396
+#: ../templates/tree/edit.php:242 ../templates/config/confmain.php:397
 #: ../templates/selfService/adminMain.php:553 ../lib/modules.inc:1059
 msgid "required"
 msgstr "erforderlich"
 
-#: ../templates/config/confmain.php:397
+#: ../templates/config/confmain.php:398
 msgid "required for Samba 3 accounts"
 msgstr "erforderlich für Samba 3 Accounts"
 
 #: ../lib/modules/posixGroup.inc:360 ../lib/modules/sambaAccount.inc:227
-#: ../lib/modules/sambaSamAccount.inc:293 ../lib/modules/posixAccount.inc:237
+#: ../lib/modules/sambaSamAccount.inc:296 ../lib/modules/posixAccount.inc:237
 msgid "secret"
 msgstr "geheim"