diff --git a/doc/configuration.rst b/doc/configuration.rst
index 81840d8d3..dbaed6d09 100644
--- a/doc/configuration.rst
+++ b/doc/configuration.rst
@@ -440,3 +440,25 @@ For example, you could setup a cron job to run this script every night::
   #
   # Or like this if you use a virtual environment:
   # 0 0 * * * <virtualenv path/bin/python> <modoboa_site>/manage.py clearsessions
+
+.. _inactive_accounts:
+
+Cleaning inactive accounts
+==========================
+
+Thanks to :ref:`lastlogin`, it is now possible to monitor inactive
+accounts. An account is considered inactive if no login has been
+recorded for the last 30 days (this value can be changed through the
+admin panel).
+
+A management command is available to disable or delete inactive
+accounts. For example, you could setup a cron job to run it every
+night::
+
+  0 0 * * * <modoboa_site>/manage.py clean_inactive_accounts
+  #
+  # Or like this if you use a virtual environment:
+  # 0 0 * * * <virtualenv path/bin/python> <modoboa_site>/manage.py clean_inactive_accounts
+
+The default behaviour is to disable accounts. You can delete them
+using the ``--delete`` option.
diff --git a/doc/manual_installation/dovecot.rst b/doc/manual_installation/dovecot.rst
index 010d2a582..52adbbeac 100644
--- a/doc/manual_installation/dovecot.rst
+++ b/doc/manual_installation/dovecot.rst
@@ -401,6 +401,8 @@ Restart Dovecot.
 
 Now, you can go to the :ref:`postfix` section to finish the installation.
 
+.. _lastlogin:
+
 Last-login tracking
 ===================
 
diff --git a/doc/upgrade.rst b/doc/upgrade.rst
index 3bdad2369..f62489fee 100644
--- a/doc/upgrade.rst
+++ b/doc/upgrade.rst
@@ -84,6 +84,11 @@ documentation.
 Specific instructions
 *********************
 
+1.9.0
+=====
+
+If you want to manage inactive accounts, look at :ref:`inactive_accounts`.
+
 1.8.3
 =====