diff --git a/lam/HISTORY b/lam/HISTORY
index 73aba618..d7149a53 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -3,6 +3,7 @@ December 2016 5.6
   - Windows: added support for pager, otherPager, mobile, otherMobile, company and proxyAddresses (disabled by default in server profile)
   - Mail routing: enable for groups and allow to add/remove the extension
   - LAM Pro:
+   -> Password self reset: support for up to 3 security questions
    -> 389ds: new wildcards for custom scripts: $INFO.389lockingStatusChange$ and $INFO.389deactivationStatusChange$
    -> Custom scripts: custom button label supported for manual scripts
 
diff --git a/lam/docs/manual-sources/howto.xml b/lam/docs/manual-sources/howto.xml
index 6e095c18..4bfb2384 100644
--- a/lam/docs/manual-sources/howto.xml
+++ b/lam/docs/manual-sources/howto.xml
@@ -3853,7 +3853,8 @@ mysql> GRANT ALL PRIVILEGES ON lam_cron.* TO 'lam_cron'@'localhost';
         <para>Now select the tab "Module settings" and specify the list of
         possible security questions. Only these questions will be selectable
         when you later edit accounts unless you explicitly allow to enter
-        custom questions.</para>
+        custom questions. LAM Pro supports to set up to three security
+        questions per user.</para>
 
         <para>If you do not want to set backup email addresses then you can
         hide this option.</para>
@@ -9363,7 +9364,7 @@ OK (10 msec)</programlisting>
 
         <para>There are special fields that you may put on the self service
         page for your users. These fields allow them to change the reset
-        question and its answer. It is also possible to set a backup email
+        questions and its answers. It is also possible to set a backup email
         address to reset passwords with an external email address.</para>
 
         <screenshot>
@@ -9411,7 +9412,7 @@ OK (10 msec)</programlisting>
         </screenshot>
 
         <para>LAM Pro will use this information to find the correct LDAP entry
-        of this user. It then displays the user's security question and input
+        of this user. It then displays the user's security questions and input
         fields for his new password. If the answer is correct then the new
         password will be set. Additionally, pwdAccountLockedTime will be
         removed and shadowLastChange updated to the current time if
diff --git a/lam/docs/manual-sources/images/passwordSelfReset2.png b/lam/docs/manual-sources/images/passwordSelfReset2.png
index 3bcc9f5a..9baf482f 100644
Binary files a/lam/docs/manual-sources/images/passwordSelfReset2.png and b/lam/docs/manual-sources/images/passwordSelfReset2.png differ
diff --git a/lam/docs/manual-sources/images/passwordSelfReset3.png b/lam/docs/manual-sources/images/passwordSelfReset3.png
index 1b5adde3..b810f169 100644
Binary files a/lam/docs/manual-sources/images/passwordSelfReset3.png and b/lam/docs/manual-sources/images/passwordSelfReset3.png differ
diff --git a/lam/docs/manual-sources/images/passwordSelfReset6.png b/lam/docs/manual-sources/images/passwordSelfReset6.png
index f9a8b191..cce73968 100644
Binary files a/lam/docs/manual-sources/images/passwordSelfReset6.png and b/lam/docs/manual-sources/images/passwordSelfReset6.png differ
diff --git a/lam/docs/manual-sources/images/passwordSelfReset8.png b/lam/docs/manual-sources/images/passwordSelfReset8.png
index 9165da4d..5ad9d608 100644
Binary files a/lam/docs/manual-sources/images/passwordSelfReset8.png and b/lam/docs/manual-sources/images/passwordSelfReset8.png differ
diff --git a/lam/docs/manual-sources/images/passwordSelfReset9.png b/lam/docs/manual-sources/images/passwordSelfReset9.png
index 2f847661..08f157fb 100644
Binary files a/lam/docs/manual-sources/images/passwordSelfReset9.png and b/lam/docs/manual-sources/images/passwordSelfReset9.png differ