diff --git a/doc/configuration.rst b/doc/configuration.rst
index dbaed6d09..628261179 100644
--- a/doc/configuration.rst
+++ b/doc/configuration.rst
@@ -103,6 +103,20 @@ The *admin* application exposes several parameters, they are presented below:
 |                    |                     |                               |                    |
 |                    |                     |                               |                    |
 +--------------------+---------------------+-------------------------------+--------------------+
+|DKIM keys storage   |Admin                |Path to a directory where DKIM |                    |
+|directory           |                     | generated keys will be stored |                    |
+|                    |                     |                               |                    |
+|                    |                     |                               |                    |
+|                    |                     |                               |                    |
+|                    |                     |                               |                    |
++--------------------+---------------------+-------------------------------+--------------------+
+|Default DKIM key    |Admin                |The default size (in bits) for |2048                |
+|length              |                     |new keys                       |                    |
+|                    |                     |                               |                    |
+|                    |                     |                               |                    |
+|                    |                     |                               |                    |
+|                    |                     |                               |                    |
++--------------------+---------------------+-------------------------------+--------------------+
 |Handle mailboxes on |Admin                |Rename or remove               |no                  |
 |filesystem          |                     |mailboxes on the               |                    |
 |                    |                     |filesystem when they           |                    |
diff --git a/doc/manual_installation/modoboa.rst b/doc/manual_installation/modoboa.rst
index d2842360b..5387a851b 100644
--- a/doc/manual_installation/modoboa.rst
+++ b/doc/manual_installation/modoboa.rst
@@ -190,5 +190,8 @@ following content inside::
   # Public API communication
   0       *       *       *       *       root    $PYTHON $INSTANCE/manage.py communicate_with_public_api
 
+  # Generate DKIM keys (they will belong to the user running this job)
+  *       *       *       *       *       root    $PYTHON $INSTANCE/manage.py modo manage_dkim_keys
+
 
 Now you can continue to the :ref:`webserver` section.
diff --git a/modoboa/admin/app_settings.py b/modoboa/admin/app_settings.py
index 6ce1b66f4..453bc49c7 100644
--- a/modoboa/admin/app_settings.py
+++ b/modoboa/admin/app_settings.py
@@ -73,7 +73,7 @@ class AdminParametersForm(param_forms.AdminParametersForm):
         initial=1024,
         choices=constants.DKIM_KEY_LENGTHS,
         help_text=ugettext_lazy(
-            "Default length for newly generated DKIM keys."
+            "Default length in bits for newly generated DKIM keys."
         )
     )
 
diff --git a/modoboa/admin/migrations/0012_auto_20180112_1658.py b/modoboa/admin/migrations/0012_auto_20180112_1658.py
index ba9f1f071..a69e64388 100644
--- a/modoboa/admin/migrations/0012_auto_20180112_1658.py
+++ b/modoboa/admin/migrations/0012_auto_20180112_1658.py
@@ -20,7 +20,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='domain',
             name='dkim_key_selector',
-            field=models.CharField(default='default', max_length=30, verbose_name='Key selector'),
+            field=models.CharField(default='modoboa', max_length=30, verbose_name='Key selector'),
         ),
         migrations.AddField(
             model_name='domain',
diff --git a/modoboa/admin/models/domain.py b/modoboa/admin/models/domain.py
index 30a9e0219..fa0337a3a 100644
--- a/modoboa/admin/models/domain.py
+++ b/modoboa/admin/models/domain.py
@@ -65,7 +65,7 @@ class Domain(AdminObject):
             "generated for this domain."),
         default=False
     )
-    dkim_key_selector = models.CharField(max_length=30, default="default")
+    dkim_key_selector = models.CharField(max_length=30, default="modoboa")
     dkim_key_length = models.PositiveIntegerField(
         ugettext_lazy("Key length"), choices=constants.DKIM_KEY_LENGTHS,
         blank=True, null=True