diff --git a/data/hooks/diagnosis/10-ip.py b/data/hooks/diagnosis/10-ip.py
index b29076467..8c8dbe95b 100644
--- a/data/hooks/diagnosis/10-ip.py
+++ b/data/hooks/diagnosis/10-ip.py
@@ -57,7 +57,8 @@ class IPDiagnoser(Diagnoser):
         elif not good_resolvconf:
             yield dict(meta={"test": "dnsresolv"},
                        status="WARNING",
-                       summary=("diagnosis_ip_weird_resolvconf", {}))
+                       summary=("diagnosis_ip_weird_resolvconf", {}),
+                       details=[("diagnosis_ip_weird_resolvconf_details", ())])
         else:
             yield dict(meta={"test": "dnsresolv"},
                        status="SUCCESS",
diff --git a/data/hooks/diagnosis/12-dnsrecords.py b/data/hooks/diagnosis/12-dnsrecords.py
index 0e8aaa07e..b59ffbd54 100644
--- a/data/hooks/diagnosis/12-dnsrecords.py
+++ b/data/hooks/diagnosis/12-dnsrecords.py
@@ -52,7 +52,7 @@ class DNSRecordsDiagnoser(Diagnoser):
                     discrepancies.append(("diagnosis_dns_discrepancy", (r["type"], r["name"], expected_value, current_value)))
 
             if discrepancies:
-                status = "ERROR" if (category == "basic" or is_main_domain) else "WARNING"
+                status = "ERROR" if (category == "basic" or (is_main_domain and category != "extra")) else "WARNING"
                 summary = ("diagnosis_dns_bad_conf", {"domain": domain, "category": category})
             else:
                 status = "SUCCESS"
diff --git a/locales/en.json b/locales/en.json
index 6dce769f1..65b3ef64d 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -163,9 +163,10 @@
     "diagnosis_ip_dnsresolution_working": "Domain name resolution is working!",
     "diagnosis_ip_broken_dnsresolution": "Domain name resolution seems to be broken for some reason ... Is a firewall blocking DNS requests ?",
     "diagnosis_ip_broken_resolvconf": "Domain name resolution seems to be broken on your server, which seems related to /etc/resolv.conf not pointing to 127.0.0.1.",
-    "diagnosis_ip_weird_resolvconf": "Be careful that you seem to be using a custom /etc/resolv.conf. Instead, this file should be a symlink to /etc/resolvconf/run/resolv.conf itself pointing to 127.0.0.1 (dnsmasq).",
+    "diagnosis_ip_weird_resolvconf": "DNS resolution seems to be working, but be careful that you seem to be using a custom /etc/resolv.conf.",
+    "diagnosis_ip_weird_resolvconf_details": "Instead, this file should be a symlink to /etc/resolvconf/run/resolv.conf itself pointing to 127.0.0.1 (dnsmasq). The actual resolvers should be configured via /etc/resolv.dnsmasq.conf.",
     "diagnosis_dns_good_conf": "Good DNS configuration for domain {domain} (category {category})",
-    "diagnosis_dns_bad_conf": "Bad DNS configuration for domain {domain} (category {category})",
+    "diagnosis_dns_bad_conf": "Bad / missing DNS configuration for domain {domain} (category {category})",
     "diagnosis_dns_missing_record": "According to the recommended DNS configuration, you should add a DNS record with type {0}, name {1} and value {2}",
     "diagnosis_dns_discrepancy": "According to the recommended DNS configuration, the value for the DNS record with type {0} and name {1} should be {2}, not {3}.",
     "diagnosis_services_good_status": "Service {service} is {status} as expected!",