diff --git a/lam/HISTORY b/lam/HISTORY
index a686a3ae..026817e9 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -5,6 +5,7 @@ June 2012
    -> Custom fields module allows to manage custom LDAP attributes in Self Service
    -> Separate group of names module for users allows to manage memberships if Unix module is not used (RFE 3504429)
    -> Named object module for groups (used for rfc2307bis schema)
+   -> Password change page allows account (un)locking
   - fixed bugs
    -> Asterisk extensions with same name (3528288)
 
diff --git a/lam/docs/manual-sources/howto.xml b/lam/docs/manual-sources/howto.xml
index 0d3a582d..50c76f12 100644
--- a/lam/docs/manual-sources/howto.xml
+++ b/lam/docs/manual-sources/howto.xml
@@ -3945,11 +3945,11 @@ Run slapindex to rebuild the index.
       <title>Password reset page</title>
 
       <para>This special page allows your deskside support staff to reset the
-      Unix and Samba passwords of your users. If you set the <link
-      linkend="s_accessLevel">access level</link> to "Change passwords" then
-      LAM will not allow any changes to the LDAP database except password
-      changes via this page. The account pages will be still available in
-      read-only mode.</para>
+      Unix and Samba passwords of your users. Account may also be (un)locked
+      If you set the <link linkend="s_accessLevel">access level</link> to
+      "Change passwords" then LAM will not allow any changes to the LDAP
+      database except password changes via this page. The account pages will
+      be still available in read-only mode.</para>
 
       <para>You can open the password reset page by clicking on the key symbol
       on each user account:</para>
@@ -4048,7 +4048,23 @@ Run slapindex to rebuild the index.
         </listitem>
       </itemizedlist>
 
-      <para></para>
+      <literallayout>
+</literallayout>
+
+      <para><emphasis role="bold">Account (un)locking:</emphasis></para>
+
+      <para>Depending if the account includes a Unix/Samba extension and
+      PPolicy is activated the page will show options to (un)lock the account.
+      E.g. if the account is fully unlocked then there will be no unlocking
+      options printed.</para>
+
+      <screenshot>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/passwordReset3.png" />
+          </imageobject>
+        </mediaobject>
+      </screenshot>
     </section>
   </chapter>
 
diff --git a/lam/docs/manual-sources/images/passwordReset3.png b/lam/docs/manual-sources/images/passwordReset3.png
new file mode 100644
index 00000000..4870120e
Binary files /dev/null and b/lam/docs/manual-sources/images/passwordReset3.png differ