diff --git a/modoboa/admin/templates/admin/_domain_dnschecks_status.html b/modoboa/admin/templates/admin/_domain_dnschecks_status.html
index 9cc150a2b..1e123a4ae 100644
--- a/modoboa/admin/templates/admin/_domain_dnschecks_status.html
+++ b/modoboa/admin/templates/admin/_domain_dnschecks_status.html
@@ -11,8 +11,4 @@
   {% if enable_dnsbl_checks %}
     <span class="label label-mini label-{{ domain.dnsbl_status_color }}"><a href="{% url 'admin:dnsbl_domain_detail' domain.pk %}" data-toggle="ajaxmodal">DNSBL</a></span>
   {% endif %}
-  <span class="label label-mini label-success">SPF</span>
-  <span class="label label-mini label-success">DKIM</span>
-  <span class="label label-mini label-success">DMARC</span>
-  <span class="label label-mini label-success">CONFIG</span>
 {% endif %}
diff --git a/modoboa/admin/templates/admin/domain_detail.html b/modoboa/admin/templates/admin/domain_detail.html
index 46a402190..fbebca6ab 100644
--- a/modoboa/admin/templates/admin/domain_detail.html
+++ b/modoboa/admin/templates/admin/domain_detail.html
@@ -102,7 +102,7 @@
         <tr>
           <th>{% trans "DKIM key" %}</th>
           <td>
-            {% if True %}
+            {% if domain.dkim_public_key %}
               <button type="button" class="btn btn-primary btn-xs" data-toggle="modal" data-target="#domain_dkim_key">
                 {% trans "Show key" %}
               </button>
diff --git a/test_project/modoboa.db b/test_project/modoboa.db
index a8562b826..f2243ce5b 100644
Binary files a/test_project/modoboa.db and b/test_project/modoboa.db differ