diff --git a/lam/docs/manual-sources/howto.xml b/lam/docs/manual-sources/howto.xml
index 1078a346..2de7e234 100644
--- a/lam/docs/manual-sources/howto.xml
+++ b/lam/docs/manual-sources/howto.xml
@@ -2497,7 +2497,11 @@ Have fun!
 
         <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.</para>
+        when you later edit accounts unless you explicitly allow to enter
+        custom questions.</para>
+
+        <para>If you do not want to set backup email addresses then you can
+        hide this option.</para>
 
         <screenshot>
           <mediaobject>
@@ -3410,19 +3414,37 @@ Have fun!
         of using groupOfNames as basis for your groups you may also use
         namedObject.</para>
 
+        <para>Module activation:</para>
+
         <para><screenshot>
             <mediaobject>
               <imageobject>
                 <imagedata fileref="images/rfc2307bis.png" />
               </imageobject>
             </mediaobject>
-          </screenshot><screenshot>
-            <mediaobject>
-              <imageobject>
-                <imagedata fileref="images/mod_unixGroupLAMPro.png" />
-              </imageobject>
-            </mediaobject>
           </screenshot></para>
+
+        <para>The GID number will be filled automatically based on the server
+        profile configuration.</para>
+
+        <screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="images/mod_unixGroupLAMPro.png" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+
+        <para>Group members can be edited and also synced with Group of
+        (unique) names.</para>
+
+        <screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="images/mod_unixGroupLAMPro2.png" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
       </section>
 
       <section>
@@ -3432,6 +3454,18 @@ Have fun!
         types and also create Windows predefined groups like "Domain
         admins".</para>
 
+        <para>Module activation:</para>
+
+        <screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="images/mod_sambaGroup2.png" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+
+        <para>Group editing:</para>
+
         <screenshot>
           <mediaobject>
             <imageobject>
diff --git a/lam/docs/manual-sources/images/mod_sambaGroup2.png b/lam/docs/manual-sources/images/mod_sambaGroup2.png
new file mode 100644
index 00000000..a04b2672
Binary files /dev/null and b/lam/docs/manual-sources/images/mod_sambaGroup2.png differ
diff --git a/lam/docs/manual-sources/images/mod_unixGroupLAMPro2.png b/lam/docs/manual-sources/images/mod_unixGroupLAMPro2.png
new file mode 100644
index 00000000..08aef38c
Binary files /dev/null and b/lam/docs/manual-sources/images/mod_unixGroupLAMPro2.png differ
diff --git a/lam/docs/manual-sources/images/passwordSelfReset1.png b/lam/docs/manual-sources/images/passwordSelfReset1.png
index 9718f35b..4d9a9666 100644
Binary files a/lam/docs/manual-sources/images/passwordSelfReset1.png and b/lam/docs/manual-sources/images/passwordSelfReset1.png differ
diff --git a/lam/docs/manual-sources/images/passwordSelfReset8.png b/lam/docs/manual-sources/images/passwordSelfReset8.png
index 8a521c11..9165da4d 100644
Binary files a/lam/docs/manual-sources/images/passwordSelfReset8.png and b/lam/docs/manual-sources/images/passwordSelfReset8.png differ