diff --git a/lam/lib/modules/account.inc b/lam/lib/modules/account.inc
index c08cb63c..14bcd2d1 100644
--- a/lam/lib/modules/account.inc
+++ b/lam/lib/modules/account.inc
@@ -75,10 +75,24 @@ class account extends baseModule {
 		// help Entries
 		$return['help'] = array (
 			'host' => array(
+				'uid' => array(
+					"Headline" => _("Host name"),
+					"Text" => _("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 does not allow it. LAM does not allow capital letters A-Z because it can cause several problems. Host names are always ending with $. If last character is not $ it will be added. If host name is already used host name will be expanded with a number. The next free number will be used.")
+				),
 				'description'	=>	array (
 					"Headline" => _("Description"),
 					"Text" => _("Host description. If left empty host name will be used.")
 				)
+			),
+			'user' => array(
+				'uid' => array(
+					"Headline" => _("User name"),
+					"Text" => _("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 does not allow it. LAM does not allow capital letters A-Z because it can cause several problems. If user name is already used user name will be expanded with a number. The next free number will be used. Warning: Older systems have problems with user names longer than 8 characters. You can not log in to Windows if user name is longer than 16 characters.")
+				),
+				'description'	=>	array (
+					"Headline" => _("Description"),
+					"Text" => _("User description. If left empty user name will be used.")
+				)
 			)
 		);
 		// upload columns
diff --git a/lam/lib/modules/posixAccount.inc b/lam/lib/modules/posixAccount.inc
index 9cae134d..73fbfd62 100644
--- a/lam/lib/modules/posixAccount.inc
+++ b/lam/lib/modules/posixAccount.inc
@@ -396,6 +396,10 @@ class posixAccount extends baseModule {
 				'description' => array (
 					"Headline" => _("Description"),
 					"Text" => _("Host description. If left empty host name will be used.")
+				),
+				'cn' => array (
+					"Headline" => _("Common name"),
+					"Text" => _("This is the natural name of the host. If empty, the host name will be used.")
 				)
 			)
 		);
diff --git a/lam/lib/modules/sambaDomain.inc b/lam/lib/modules/sambaDomain.inc
index 9a1b4aca..919107fe 100644
--- a/lam/lib/modules/sambaDomain.inc
+++ b/lam/lib/modules/sambaDomain.inc
@@ -82,7 +82,7 @@ class sambaDomain extends baseModule {
 				"Headline" => _("Next group RID"),
 				"Text" => _("Next RID to use when creating group accounts (only used by Winbind).")
 			),
-			'nextRID' => array(
+			'RIDbase' => array(
 				"Headline" => _("RID base"),
 				"Text" => _("Used for calculating RIDs from UID/GID. Do not change if unsure.")
 			),