diff --git a/lam/config/passwordMailTemplate.txt b/lam/config/passwordMailTemplate.txt
deleted file mode 100644
index 28aac99a..00000000
--- a/lam/config/passwordMailTemplate.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Your password was reset
-Dear @@givenName@@ @@sn@@,
-
-your password was reset to: @@newPassword@@
-
-
-Best regards
-
-deskside support
diff --git a/lam/docs/manual-sources/howto.xml b/lam/docs/manual-sources/howto.xml
index e3f06f68..395cd36f 100644
--- a/lam/docs/manual-sources/howto.xml
+++ b/lam/docs/manual-sources/howto.xml
@@ -638,8 +638,6 @@ Have fun!
 
         <simplelist>
           <member>config/selfService/*.*</member>
-
-          <member>config/passwordMailTemplate.txt</member>
         </simplelist>
 
         <para>Second, <link linkend="a_uninstall">uninstall</link> your
@@ -666,6 +664,21 @@ Have fun!
       <section id="a_versUpgrade">
         <title>Version specific upgrade instructions</title>
 
+        <section>
+          <title>3.4.0 -&gt; 3.5.0</title>
+
+          <para><emphasis role="bold">LAM Pro:</emphasis> The global
+          config/passwordMailTemplate.txt is no longer supported. You can
+          setup the mail settings now for each LAM server profile which
+          provides more flexibility.</para>
+        </section>
+
+        <section>
+          <title>3.3.0 -&gt; 3.4.0</title>
+
+          <para>No changes.</para>
+        </section>
+
         <section>
           <title>3.2.0 -&gt; 3.3.0</title>
 
@@ -3114,8 +3127,8 @@ Have fun!
 
           <para>If the user account has set the mail attribute then LAM can
           send your user a mail with the new password. You can change the mail
-          template to fit your needs. See the help link for further
-          details.</para>
+          template to fit your needs. Please configure your LAM server profile
+          to setup the sender address, subject and mail body.</para>
 
           <para>Using this method will prevent that your support staff knows
           the new password.</para>
diff --git a/lam/help/help.inc b/lam/help/help.inc
index 2e7c7e44..40df0193 100644
--- a/lam/help/help.inc
+++ b/lam/help/help.inc
@@ -182,13 +182,13 @@ $helpArray = array (
 				"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.")),
 				"520" => array ("Headline" => _("Generate random password"),
-					"Text" => _("This will set a random password and display it on the screen or send it the user via mail.")),
+					"Text" => _("This will set a random password and display it on the screen or send it the user via mail. Please edit your LAM server profile to setup the mail settings.")),
 				"550" => array ("Headline" => _("From address"),
 					"Text" => _("This email address will be set as sender address of all password mails. If empty the system default (php.ini) will be used.")),
 				"551" => array ("Headline" => _("Subject"),
-					"Text" => _('The subject of all password mails. If empty the first line of "config/passwordMailTemplate.txt" will be used.')),
+					"Text" => _('The subject of all password mails.')),
 				"552" => array ("Headline" => _("Text"),
-					"Text" => _('The mail text of all password mails. If empty the content of "config/passwordMailTemplate.txt" starting at the second line will be used.') .
+					"Text" => _('The mail text of all password mails.') .
 						'<br><br><b>' . _('Format') . ': </b><ul>' .
 						'<li>' . _('You can use wildcards for LDAP attributes in the form @@attribute@@ (e.g. @@uid@@ for the user name).') . '</li>' .
 						'<li>' . _('The wildcard for the new password is @@newPassword@@.') . '</li>'),