diff --git a/lam/help/help.inc b/lam/help/help.inc
index 68b5d2a7..94626e15 100644
--- a/lam/help/help.inc
+++ b/lam/help/help.inc
@@ -111,8 +111,44 @@ $helpArray = array (
 				"305" => array ("ext" => "FALSE", "Headline" => _("Profile Editor - Path to home directory"),
 					"Text" => _("This is the path to the user's home directory. The home directory will be connected at login."),
 					"SeeAlso" => "<a href=\"./help.php?HelpNumber=304\" target=\"_self\">Home drive</a>"),
+				"306" => array ("ext" => "FALSE", "Headline" => _("Profile Editor - Profile path"),
+					"Text" => _("This is the path to the user's profile directory. If you do not want profiles to be saved on the server leave this empty.")),
+				"307" => array ("ext" => "FALSE", "Headline" => _("Profile Editor - Script path"),
+					"Text" => _("This is the path to the logon script directory.")),
+				"308" => array ("ext" => "FALSE", "Headline" => _("Profile Editor - User Workstations"),
+					"Text" => _("These are the workstations on which the user is allowed to login. They have to be seperated by spaces".
+						" (e.g. \"PC01 PC09 PC34\"). If the user is allowed to login on all workstations, leave this field empty.")),
+				"309" => array ("ext" => "FALSE", "Headline" => _("Profile Editor - Domain"),
+					"Text" => _("This is the Windows domain name.")),
+				"330" => array ("ext" => "FALSE", "Headline" => _("Profile Editor - Primary group"),
+					"Text" => _("This is the user's primary group.")),
+				"331" => array ("ext" => "FALSE", "Headline" => _("Profile Editor - Additional groups"),
+					"Text" => _("Other groups the user will be member of.")),
+				"332" => array ("ext" => "FALSE", "Headline" => _("Profile Editor - Home Directory"),
+					"Text" => _("This is the path to the user's Unix home directory.")),
+				"333" => array ("ext" => "FALSE", "Headline" => _("Profile Editor - Login Shell"),
+					"Text" => _("This is the user's login shell. Set to \"/bin/bash\" if unsure.")),
+				"334" => array ("ext" => "FALSE", "Headline" => _("Profile Editor - Set Unix Password"),
+					"Text" => _("If set to \"no\" the Unix password will not be set and the user will be unable to login.".
+						"<br><br>If unsure say \"yes\" here.")),
+				"335" => array ("ext" => "FALSE", "Headline" => _("Profile Editor - Password warning"),
+					"Text" => _("Number of days a user will be warned before his password expires.")),
+				"336" => array ("ext" => "FALSE", "Headline" => _("Profile Editor - Password expiry"),
+					"Text" => _("Number of days a user will be able to login after his password expired.")),
+				"337" => array ("ext" => "FALSE", "Headline" => _("Profile Editor - Maximum password age"),
+					"Text" => _("Number of days after a user will be forced to change his password.")),
+				"338" => array ("ext" => "FALSE", "Headline" => _("Profile Editor - Minimum password age"),
+					"Text" => _("Number of days a user has to wait to change his password again.")),
+				"339" => array ("ext" => "FALSE", "Headline" => _("Profile Editor - Account expires on"),
+					"Text" => _("After this date the user will no longer be able to login.")),
+				"340" => array ("ext" => "FALSE", "Headline" => _("Profile Editor - Account is deactivated"),
+					"Text" => _("If set to \"yes\" the user will not be able to login. This does not affect the Windows account.")),
 				"360" => array ("ext" => "FALSE", "Headline" => _("Profile Editor - Profile Name"),
-					"Text" => _("Name under which the profile will be saved. If a profile with the same name exists, it will be overwritten."))
+					"Text" => _("Name under which the profile will be saved. If a profile with the same name exists, it will be overwritten.")),
+				"370" => array ("ext" => "FALSE", "Headline" => _("Profile Editor - Primary Group"),
+					"Text" => _("This is primary group for the Samba machine account.")),
+				"371" => array ("ext" => "FALSE", "Headline" => _("Profile Editor - Domain"),
+					"Text" => _("This is the Windows domain name."))
 /* This is a sample help entry. Just copy this line an modify the vakues between the [] brackets.
 	Help text is located in the array:
 		"[Helpnumber]" => array ("ext" => "FALSE", "Headline" => _("[Headline]"), "Text" => _("[Text]"), "SeeAlso" => "[SeeAlso link]"),
diff --git a/lam/templates/profedit/profilehost.php b/lam/templates/profedit/profilehost.php
index 68e59df7..a02a5745 100644
--- a/lam/templates/profedit/profilehost.php
+++ b/lam/templates/profedit/profilehost.php
@@ -93,7 +93,7 @@ echo ("<table border=0>\n");
 echo ("<tr>\n");
 echo ("<td><b>" . _("Profile Name") . ":</b></td>\n");
 echo ("<td><input type=\"text\" name=\"profname\" value=\"" . $_GET['edit'] . "\"></td>\n");
-echo ("<td><a href=\"../help.php?HelpNumber=380\" target=\"lamhelp\">" . _("Help") . "</a></td>\n");
+echo ("<td><a href=\"../help.php?HelpNumber=360\" target=\"lamhelp\">" . _("Help") . "</a></td>\n");
 echo ("</tr>\n");
 echo ("<tr>\n");
 echo ("<td colspan=2>&nbsp</td>");
diff --git a/lam/templates/profedit/profileuser.php b/lam/templates/profedit/profileuser.php
index 92889647..4c0b34c2 100644
--- a/lam/templates/profedit/profileuser.php
+++ b/lam/templates/profedit/profileuser.php
@@ -159,7 +159,7 @@ echo ("</tr>\n");
 
 // password expire date
 echo ("<tr>\n");
-echo ("<td align=\"right\"><b>" . _("Password expires on") . ": </b></td>\n");
+echo ("<td align=\"right\"><b>" . _("Account expires on") . ": </b></td>\n");
 echo ("<td>\n");
 echo ("<select name=\"unix_pwdexpire_day\">\n");
 for ( $i=1; $i<=31; $i++ ) {