diff --git a/en_US/howto/ldap.bulk.create.mail.users.md b/en_US/howto/ldap.bulk.create.mail.users.md
index 31be42a2..83825b1c 100644
--- a/en_US/howto/ldap.bulk.create.mail.users.md
+++ b/en_US/howto/ldap.bulk.create.mail.users.md
@@ -1,5 +1,7 @@
 # LDAP: Bulk create mail users
 
+[TOC]
+
 iRedMail ships 2 scripts to help you create many mail users quickly.
 
 * `tools/create_mail_user_OpenLDAP.sh` (shell script) will connect to LDAP
diff --git a/en_US/howto/track.user.last.login.md b/en_US/howto/track.user.last.login.md
index 7f893ec1..69d18c29 100644
--- a/en_US/howto/track.user.last.login.md
+++ b/en_US/howto/track.user.last.login.md
@@ -192,4 +192,4 @@ sql> SELECT * FROM last_login;
 
 ## References
 
-* [Dovecot plugin: last_login](https://wiki.dovecot.org/Plugins/LastLogin)
+* [Dovecot plugin: last_login](https://doc.dovecot.org/configuration_manual/lastlogin_plugin/)
diff --git a/html/ldap.bulk.create.mail.users.html b/html/ldap.bulk.create.mail.users.html
index 5b7efb3e..91f6b117 100644
--- a/html/ldap.bulk.create.mail.users.html
+++ b/html/ldap.bulk.create.mail.users.html
@@ -16,6 +16,16 @@
         <span>iRedMail</span>
     </a>
     &nbsp;&nbsp;//&nbsp;&nbsp;<a href="./index.html">Document Index</a></div><h1 id="ldap-bulk-create-mail-users">LDAP: Bulk create mail users</h1>
+<div class="toc">
+<ul>
+<li><a href="#ldap-bulk-create-mail-users">LDAP: Bulk create mail users</a><ul>
+<li><a href="#create-mail-users-with-create_mail_user_openldapsh">Create mail users with create_mail_user_OpenLDAP.sh</a></li>
+<li><a href="#create-mail-users-with-create_mail_user_openldappy">Create mail users with create_mail_user_OpenLDAP.py</a></li>
+<li><a href="#see-also">See Also</a></li>
+</ul>
+</li>
+</ul>
+</div>
 <p>iRedMail ships 2 scripts to help you create many mail users quickly.</p>
 <ul>
 <li><code>tools/create_mail_user_OpenLDAP.sh</code> (shell script) will connect to LDAP
diff --git a/html/track.user.last.login.html b/html/track.user.last.login.html
index dec62d4d..64044b8c 100644
--- a/html/track.user.last.login.html
+++ b/html/track.user.last.login.html
@@ -206,7 +206,7 @@ sql&gt; SELECT * FROM last_login;
 
 <h2 id="references">References</h2>
 <ul>
-<li><a href="https://wiki.dovecot.org/Plugins/LastLogin">Dovecot plugin: last_login</a></li>
+<li><a href="https://doc.dovecot.org/configuration_manual/lastlogin_plugin/">Dovecot plugin: last_login</a></li>
 </ul><div class="footer">
     <p style="text-align: center; color: grey;">All documents are available in <a href="https://github.com/iredmail/docs/">GitHub repository</a>, and published under <a href="http://creativecommons.org/licenses/by-nd/3.0/us/" target="_blank">Creative Commons</a> license. You can <a href="https://github.com/iredmail/docs/archive/master.zip">download the latest version</a> for offline reading. If you found something wrong, please do <a href="https://www.iredmail.org/contact.html">contact us</a> to fix it.</p>
 </div>