diff --git a/lam-0.4/help/help.inc b/lam-0.4/help/help.inc
index e9498137..0317f370 100644
--- a/lam-0.4/help/help.inc
+++ b/lam-0.4/help/help.inc
@@ -208,13 +208,16 @@ $helpArray = array (
 				"433" => array ("ext" => "FALSE", "Headline" => _("Home drive"),
 					"Text" => _("Driveletter assigned on windows workstations as homedirectory.")),
 				"434" => array ("ext" => "FALSE", "Headline" => _("Script path"),
-					"Text" => _("Filename and -path relative to netlogon-share which should be executed on logon. \$user and \$group are replaced with user- and groupname."). ' '. _("Can be left empty.")),
+					"Text" => _("Filename and -path relative to netlogon-share which should be executed on logon. $%s and $%s are replaced with user- and groupname."). ' '. _("Can be left empty."),
+					"variables" => array('user', 'group')),
 				"435" => array ("ext" => "FALSE", "Headline" => _("Profile path"),
-					"Text" => _("Path of the userprofile. Can be a local absolute path or a UNC-path (\\\\server\\share). \$user and \$group are replaced with user- and groupname."). ' '. _("Can be left empty.")),
+					"Text" => _("Path of the userprofile. Can be a local absolute path or a UNC-path (\\\\server\\share). $%s and $%s are replaced with user- and groupname."). ' '. _("Can be left empty."),
+					"variables" => array('user', 'group')),
 				"436" => array ("ext" => "FALSE", "Headline" => _("Samba workstations"),
 					"Text" => _("List of samba workstations the user is allowed to login. Empty means every workstation."). ' '. _("Can be left empty.")),
 				"437" => array ("ext" => "FALSE", "Headline" => _("Home path"),
-					"Text" => _("UNC-path (\\\\server\\share) of homedirectory. \$user and \$group are replaced with user- and groupname."). ' '. _("Can be left empty.")),
+					"Text" => _("UNC-path (\\\\server\\share) of homedirectory. $%s and $%s are replaced with user- and groupname."). ' '. _("Can be left empty."),
+					"variables" => array('user', 'group')),
 				"438" => array ("ext" => "FALSE", "Headline" => _("Domain"),
 					"Text" => _("Windows-Domain of user."). ' '. _("Can be left empty.")),
 				"439" => array ("ext" => "FALSE", "Headline" => _("Mountpoint"),
diff --git a/lam-0.4/templates/account/useredit.php b/lam-0.4/templates/account/useredit.php
index 80e48798..553b693a 100644
--- a/lam-0.4/templates/account/useredit.php
+++ b/lam-0.4/templates/account/useredit.php
@@ -292,7 +292,7 @@ switch ($_POST['select']) {
 			$account_new->general_homedir = str_replace('$group', $account_new->general_group, $account_new->general_homedir);
 			if ($account_new->general_username != '')
 				$account_new->general_homedir = str_replace('$user', $account_new->general_username, $account_new->general_homedir);
-			if ($account_new->general_homedir != $_POST['f_general_homedir']) $errors[] = array('INFO', _('Home directory'), _('Replaced $user or $group in homedir.'));
+			if ($account_new->general_homedir != $_POST['f_general_homedir']) $errors[] = array('INFO', _('Home directory'), _('Replaced $%s or $%s in homedir.'), array('user', 'group'));
 			if ( !ereg('^[/]([a-z]|[A-Z])([a-z]|[A-Z]|[0-9]|[.]|[-]|[_])*([/]([a-z]|[A-Z])([a-z]|[A-Z]|[0-9]|[.]|[-]|[_])*)*$', $account_new->general_homedir ))
 				$errors[] = array('ERROR', _('Home directory'), _('Homedirectory contains invalid characters.'));
 			// Check if UID is valid. If none value was entered, the next useable value will be inserted
@@ -743,8 +743,9 @@ echo "</title>\n".
 	"<input name=\"varkey\" type=\"hidden\" value=\"".$varkey."\">\n";
 
 // Display errir-messages
-if (is_array($errors))
-	for ($i=0; $i<sizeof($errors); $i++) StatusMessage($errors[$i][0], $errors[$i][1], $errors[$i][2]);
+if (is_array($errors)) {
+	for ($i=0; $i<sizeof($errors); $i++) StatusMessage($errors[$i][0], $errors[$i][1], $errors[$i][2], $errors[$i][3]);
+}
 
 // print_r($account_new);
 //print_r($account_old);
diff --git a/lam/help/help.inc b/lam/help/help.inc
index e9498137..0317f370 100644
--- a/lam/help/help.inc
+++ b/lam/help/help.inc
@@ -208,13 +208,16 @@ $helpArray = array (
 				"433" => array ("ext" => "FALSE", "Headline" => _("Home drive"),
 					"Text" => _("Driveletter assigned on windows workstations as homedirectory.")),
 				"434" => array ("ext" => "FALSE", "Headline" => _("Script path"),
-					"Text" => _("Filename and -path relative to netlogon-share which should be executed on logon. \$user and \$group are replaced with user- and groupname."). ' '. _("Can be left empty.")),
+					"Text" => _("Filename and -path relative to netlogon-share which should be executed on logon. $%s and $%s are replaced with user- and groupname."). ' '. _("Can be left empty."),
+					"variables" => array('user', 'group')),
 				"435" => array ("ext" => "FALSE", "Headline" => _("Profile path"),
-					"Text" => _("Path of the userprofile. Can be a local absolute path or a UNC-path (\\\\server\\share). \$user and \$group are replaced with user- and groupname."). ' '. _("Can be left empty.")),
+					"Text" => _("Path of the userprofile. Can be a local absolute path or a UNC-path (\\\\server\\share). $%s and $%s are replaced with user- and groupname."). ' '. _("Can be left empty."),
+					"variables" => array('user', 'group')),
 				"436" => array ("ext" => "FALSE", "Headline" => _("Samba workstations"),
 					"Text" => _("List of samba workstations the user is allowed to login. Empty means every workstation."). ' '. _("Can be left empty.")),
 				"437" => array ("ext" => "FALSE", "Headline" => _("Home path"),
-					"Text" => _("UNC-path (\\\\server\\share) of homedirectory. \$user and \$group are replaced with user- and groupname."). ' '. _("Can be left empty.")),
+					"Text" => _("UNC-path (\\\\server\\share) of homedirectory. $%s and $%s are replaced with user- and groupname."). ' '. _("Can be left empty."),
+					"variables" => array('user', 'group')),
 				"438" => array ("ext" => "FALSE", "Headline" => _("Domain"),
 					"Text" => _("Windows-Domain of user."). ' '. _("Can be left empty.")),
 				"439" => array ("ext" => "FALSE", "Headline" => _("Mountpoint"),