diff --git a/lam/docs/manual-sources/howto.xml b/lam/docs/manual-sources/howto.xml
index 922ad8e3..ac0a019c 100644
--- a/lam/docs/manual-sources/howto.xml
+++ b/lam/docs/manual-sources/howto.xml
@@ -5287,6 +5287,14 @@ Run slapindex to rebuild the index.
                 with.</entry>
               </row>
 
+              <row>
+                <entry>Password field label</entry>
+
+                <entry>This text is placed as label for the password field on
+                the login page. LAM will use "Password" if you do not enter
+                any text.</entry>
+              </row>
+
               <row>
                 <entry>Login caption</entry>
 
diff --git a/lam/docs/manual-sources/images/conf4.jpg b/lam/docs/manual-sources/images/conf4.jpg
index 6db17092..71a6dae0 100644
Binary files a/lam/docs/manual-sources/images/conf4.jpg and b/lam/docs/manual-sources/images/conf4.jpg differ
diff --git a/lam/help/help.inc b/lam/help/help.inc
index 411c0879..3c77f71c 100644
--- a/lam/help/help.inc
+++ b/lam/help/help.inc
@@ -217,6 +217,8 @@ $helpArray = array (
 					"Text" => _("This HTML code will be placed on top of all self service pages. E.g. you can use this to place your custom logo. Any HTML code is permitted.")),
 				"510" => array ("Headline" => _("Additional CSS links"),
 					"Text" => _("Here you can specify additional CSS links to change the layout of the self service pages. This is useful to adapt them to your corporate design. Please enter one link per line.")),
+				"511" => array ("Headline" => _("Password field label"),
+					"Text" => _('This text is placed as label for the password field on the login page. LAM will use "Password" if you do not enter any text.')),				
 				"520" => array ("Headline" => _("Generate random password"),
 					"Text" => _("This will set a random password and display it on the screen or send it to the user via mail. Please edit your LAM server profile to setup the mail settings.")),
 				"550" => array ("Headline" => _("From address"),
diff --git a/lam/lib/selfService.inc b/lam/lib/selfService.inc
index bbd66399..3ab64f84 100644
--- a/lam/lib/selfService.inc
+++ b/lam/lib/selfService.inc
@@ -322,6 +322,9 @@ class selfServiceProfile {
 
 	/** describing text for user login */
 	public $loginCaption;
+	
+	/** label for password input */
+	public $passwordLabel;
 
 	/** describing text for search attribute */
 	public $loginAttributeText;
@@ -364,6 +367,7 @@ class selfServiceProfile {
 		$this->additionalCSS = '';
 		$this->loginCaption = '<b>' . _("Welcome to LAM self service. Please enter your user name and password.") . '</b>';
 		$this->loginAttributeText = _('User name');
+		$this->passwordLabel = '';
 		$this->mainPageText = "<h1>LAM self service</h1>\n" . _("Here you can change your personal settings.");
 		$this->inputFields = array(
 			array('name' => _('Personal data'),