diff --git a/src/locales/en.json b/src/locales/en.json
index 14b2562b..9af3b58d 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -83,7 +83,8 @@
     "domain_dns_conf_is_just_a_recommendation": "This page shows you the *recommended* configuration. It does *not* configure the DNS for you. It is your responsability to configure your DNS zone in your DNS registrar according to this recommendation.",
     "diagnosis": "Diagnosis",
     "diagnosis_experimental_disclaimer": "Be aware that the diagnosis feature is still experimental and being polished, and it may not be fully reliable.",
-    "diagnosis_first_run": "The diagnosis feature will attempt to identify common issues on the different aspects of your server to make sure everything runs smoothly. Please do not panic if you see a bunch of errors right after setting up your server: it is precisely meant to help you to identify issues and guide you to fix them. The diagnosis will also run automatically twice a day and email the administrator if some issue arise.",
+    "diagnosis_first_run": "The diagnosis feature will attempt to identify common issues on the different aspects of your server to make sure everything runs smoothly. Please do not panic if you see a bunch of errors right after setting up your server: it is precisely meant to help you to identify issues and guide you to fix them. The diagnosis will also run automatically twice a day and an email is sent to the administrator if issues are found.",
+    "diagnosis_explanation": "The diagnosis feature will attempt to identify common issues on the different aspects of your server to make sure everything runs smoothly. The diagnosis run automatically twice a day and an email is sent to the administrator if issues are found. Note that some tests may not be relevant if you do not want to use some specific features (for example XMPP) or may fail if you have a complex setup. In such cases, and if you know what you are doing, it is alright to ignore the corresponding issues or warnings.",
     "run_first_diagnosis": "Run initial diagnosis",
     "disable": "Disable",
     "disabled": "Disabled",
diff --git a/src/views/diagnosis/diagnosis_show.ms b/src/views/diagnosis/diagnosis_show.ms
index 98ab7080..e2f6b736 100644
--- a/src/views/diagnosis/diagnosis_show.ms
+++ b/src/views/diagnosis/diagnosis_show.ms
@@ -11,13 +11,15 @@
 
 <div class="separator"></div>
 
-{{#unless reports}}
 <div class="alert alert-info text-center">
+{{#if reports}}
+<p>{{t 'diagnosis_explanation'}}</p>
+{{else}}
 <p>{{t 'diagnosis_first_run'}}</p>
 <br>
 <button class="btn btn-info" data-action="run-full-diagnosis"><span class="fa-fw fa-stethoscope"></span> {{t 'run_first_diagnosis'}}</button>
+{{/if}}
 </div>
-{{/unless}}
 
 <div class="alert alert-warning text-center">{{t 'diagnosis_experimental_disclaimer'}}</div>