diff --git a/lam/HISTORY b/lam/HISTORY
index bf18ede0..382bc868 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -1,8 +1,9 @@
-June 2012
+July 2012
   - quick (un)lock for users
   - allow to disable tools
   - LAM Pro:
    -> Custom fields module allows to manage custom LDAP attributes in Self Service
+   -> Self service now supports user self registration
    -> 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
diff --git a/lam/docs/manual-sources/howto.xml b/lam/docs/manual-sources/howto.xml
index 50c76f12..b3bc71ff 100644
--- a/lam/docs/manual-sources/howto.xml
+++ b/lam/docs/manual-sources/howto.xml
@@ -4405,6 +4405,107 @@ Run slapindex to rebuild the index.
           </mediaobject>
         </screenshot>
       </section>
+
+      <section>
+        <title>User self registration</title>
+
+        <para>With LAM Pro your users can create their own accounts if you
+        like. LAM Pro will display an additional link on the self service
+        login page that allows you users to create a new account including
+        email validation.</para>
+
+        <para>You enable this feature in your self service profile. Just
+        activate the checkbox "Enable self registration link".</para>
+
+        <screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="images/accountRegistration1.png" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+
+        <para><emphasis role="bold">Options:</emphasis></para>
+
+        <para><emphasis>Link text:</emphasis> This is the label for the link
+        to the self registration. If empty "Register new account" will be
+        used.</para>
+
+        <para><emphasis>Admin DN and password:</emphasis> Please enter the
+        LDAP DN and its password that should be used to create new users. This
+        DN also needs to be able to do LDAP searches by uid in the self
+        service part of your LDAP tree.</para>
+
+        <para><emphasis>Object classes:</emphasis> This is a list of object
+        classes that are used to build the new user accounts. Please enter one
+        object class in each line.</para>
+
+        <para><emphasis>Attributes:</emphasis> This is a list of additional
+        attributes that the user can enter. Please note that user name,
+        password and email address are mandatory anyway and need not be
+        specified.</para>
+
+        <para>Each line represents one LDAP attribute. The options are
+        separated by "::". The first option specifies if the attribute is
+        mandatory. It can have the values "optional" and "required". The
+        second option is the LDAP attribute name and the third one is a
+        descriptive label for it. Options four and five are used for input
+        validation. Please enter the regular expression (e.g.
+        "/^[0-9a-zA-Z]+$/") and an error message if the value does not match
+        it. For a syntax description see <ulink
+        url="http://perldoc.perl.org/perlre.html">here</ulink>. Validation is
+        optional.</para>
+
+        <para>Example:</para>
+
+        <para> optional::givenName::First name::/^[[:alnum:] ]+$/u::Please
+        enter a valid first name.</para>
+
+        <para> required::sn::Last name::/^[[:alnum:] ]+$/u::Please enter a
+        valid last name.</para>
+
+        <para>If you use the object class "inetOrgPerson" and do not provide
+        the "cn" attribute then LAM will set it to the user name value.</para>
+
+        <literallayout>
+</literallayout>
+
+        <para>Please note that only simple input boxes are supported for
+        account registration. The user may log in to self service when his
+        account was created to manage all his attributes.</para>
+
+        <literallayout>
+</literallayout>
+
+        <para><emphasis role="bold">User view:</emphasis></para>
+
+        <para>The user can register by clicking on a link on the self service
+        login page:</para>
+
+        <screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="images/accountRegistration2.png" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+
+        <para>Here he can insert the data that you specified in the self
+        service profile:</para>
+
+        <screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="images/accountRegistration3.png" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+
+        <para>LAM will then send him an email with a validation link that is
+        valid for 24 hours. When he clicks on this link then the account will
+        be created in the self service user suffix. The DN will look like
+        this: <emphasis>uid=&lt;user name&gt;,...</emphasis></para>
+      </section>
     </section>
 
     <section>
diff --git a/lam/docs/manual-sources/images/accountRegistration1.png b/lam/docs/manual-sources/images/accountRegistration1.png
new file mode 100644
index 00000000..757190fe
Binary files /dev/null and b/lam/docs/manual-sources/images/accountRegistration1.png differ
diff --git a/lam/docs/manual-sources/images/accountRegistration2.png b/lam/docs/manual-sources/images/accountRegistration2.png
new file mode 100644
index 00000000..d6c3216a
Binary files /dev/null and b/lam/docs/manual-sources/images/accountRegistration2.png differ
diff --git a/lam/docs/manual-sources/images/accountRegistration3.png b/lam/docs/manual-sources/images/accountRegistration3.png
new file mode 100644
index 00000000..ab4e0f52
Binary files /dev/null and b/lam/docs/manual-sources/images/accountRegistration3.png differ