diff --git a/lam/HISTORY b/lam/HISTORY
index b52b568b..5ea882f7 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -14,6 +14,7 @@ March 2016 5.3
    -> PPolicy password notification job takes pwdExpireWarning into account
    -> Custom fields: support calendar fields
    -> Zarafa contacts: allow to create contacts without Unix extension
+   -> Added options for password rest page to server profile
 
 
 15.12.2015 5.2
diff --git a/lam/docs/manual-sources/howto.xml b/lam/docs/manual-sources/howto.xml
index eebd2515..d7421424 100644
--- a/lam/docs/manual-sources/howto.xml
+++ b/lam/docs/manual-sources/howto.xml
@@ -1666,13 +1666,8 @@ Have fun!
           problems regarding size limits on Active Directory. LAM will then
           query LDAP to return results in chunks of 999 entries.</para>
 
-          <screenshot>
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="images/configProfiles5.png" />
-              </imageobject>
-            </mediaobject>
-          </screenshot>
+          <literallayout>
+</literallayout>
 
           <para>LAM is translated to many different languages. Here you can
           select the default language for this server profile. The language
@@ -1680,6 +1675,19 @@ Have fun!
 
           <para>Please also set your time zone here.</para>
 
+          <screenshot>
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="images/configProfiles5.png" />
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+
+          <para>LAM can manage user home directories and quotas with an
+          external script. You can specify the home directory server and where
+          the script is located. The default rights for new home directories
+          can be set, too.</para>
+
           <screenshot>
             <mediaobject>
               <imageobject>
@@ -1688,15 +1696,14 @@ Have fun!
             </mediaobject>
           </screenshot>
 
-          <para id="profile_mail">LAM can manage user home directories and
-          quotas with an external script. You can specify the home directory
-          server and where the script is located. The default rights for new
-          home directories can be set, too.</para>
+          <para id="profile_mail">LAM Pro users may directly set passwords
+          from list view. You can configure if it should be possible to set
+          specific passwords and showing password on screen is allowed.</para>
 
           <screenshot>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/configProfiles9.png" />
+                <imagedata fileref="images/configProfiles10.png" />
               </imageobject>
             </mediaobject>
           </screenshot>
@@ -1708,6 +1715,16 @@ Have fun!
           can be sent to any address (e.g. a secondary address if the user
           account is also bound to the mailbox).</para>
 
+          <screenshot>
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="images/configProfiles9.png" />
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+
+          <para>LAM supports two methods for login.</para>
+
           <screenshot>
             <mediaobject>
               <imageobject>
@@ -1716,9 +1733,8 @@ Have fun!
             </mediaobject>
           </screenshot>
 
-          <para>LAM supports two methods for login. The first one is to
-          specify a fixed list of LDAP DNs that are allowed to login. Please
-          enter one DN per line.</para>
+          <para>The first one is to specify a fixed list of LDAP DNs that are
+          allowed to login. Please enter one DN per line.</para>
 
           <para>The second one is to let LAM search for the DN in your
           directory. E.g. if a user logs in with the user name "joe" then LAM
@@ -7443,8 +7459,9 @@ OK (10 msec)</programlisting>
               <imagedata fileref="images/passwordReset1.png" />
             </imageobject>
           </mediaobject>
-        </screenshot>There are three different options to set a new
-      password:</para>
+        </screenshot>There are three different options to set a new password.
+      You can further restrict these options in server profile
+      settings.</para>
 
       <itemizedlist>
         <listitem>
diff --git a/lam/docs/manual-sources/images/passwordReset2.png b/lam/docs/manual-sources/images/passwordReset2.png
index df7712ae..2251f194 100644
Binary files a/lam/docs/manual-sources/images/passwordReset2.png and b/lam/docs/manual-sources/images/passwordReset2.png differ