diff --git a/lam/HISTORY b/lam/HISTORY
index cd0539fc..8ce5244f 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -2,6 +2,8 @@ March 2012 3.7
   - Login: support bind user for login search
   - Personal: added labeledURI and cosmetic changes, description is now multi-valued (RFE 3446363)
   - New translation: Slovakian
+  - LAM Pro:
+   -> Password self reset can send password notification mails
   - Fixed bugs:
    -> DHCP: error message not displayed properly (3441975)
    -> Profile loading not possible if required fields are not filled (3444948)
diff --git a/lam/docs/manual-sources/howto.xml b/lam/docs/manual-sources/howto.xml
index e33d96df..9a8dd449 100644
--- a/lam/docs/manual-sources/howto.xml
+++ b/lam/docs/manual-sources/howto.xml
@@ -3901,8 +3901,16 @@ Run slapindex to rebuild the index.
         on your server file system. Therefore, it is required to protect your
         server against unauthorised access.</para>
 
-        <para>Finally, please specify the list of password reset questions
-        that the user can choose.</para>
+        <para>Please also specify the list of password reset questions that
+        the user can choose.</para>
+
+        <para></para>
+
+        <para>You can inform your users via mail about their password change.
+        The mail can include the new password by using the special wildcard
+        "@@newPassword@@". Additionally, you may want to insert other
+        wildcards that are replaced by the corresponding LDAP attributes. E.g.
+        "@@uid@@" will be replaced by the user name.</para>
 
         <para><emphasis role="bold">New fields for self service
         page</emphasis></para>
diff --git a/lam/docs/manual-sources/images/passwordSelfReset1.png b/lam/docs/manual-sources/images/passwordSelfReset1.png
index 0df9a79b..59830553 100644
Binary files a/lam/docs/manual-sources/images/passwordSelfReset1.png and b/lam/docs/manual-sources/images/passwordSelfReset1.png differ