diff --git a/data/hooks/diagnosis/30-services.py b/data/hooks/diagnosis/30-services.py
index 3649fdecc..a46fa735d 100644
--- a/data/hooks/diagnosis/30-services.py
+++ b/data/hooks/diagnosis/30-services.py
@@ -22,17 +22,17 @@ class ServicesDiagnoser(Diagnoser):
             if result["status"] != "running":
                 item["status"] = "ERROR"
                 item["summary"] = ("diagnosis_services_bad_status", {"service": service, "status": result["status"]})
+                item["details"] = [("diagnosis_services_bad_status_tip", (service,))]
 
             elif result["configuration"] == "broken":
                 item["status"] = "WARNING"
                 item["summary"] = ("diagnosis_services_conf_broken", {"service": service})
+                item["details"] = [(d, tuple()) for d in result["configuration-details"]]
 
             else:
                 item["status"] = "SUCCESS"
                 item["summary"] = ("diagnosis_services_running", {"service": service, "status": result["status"]})
 
-            if result["configuration"] == "broken":
-                item["details"] = [(d, tuple()) for d in result["configuration-details"]]
             yield item
 
 def main(args, env, loggers):
diff --git a/locales/en.json b/locales/en.json
index c3fd4f837..b4b05900f 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -176,6 +176,7 @@
     "diagnosis_services_running": "Service {service} is running!",
     "diagnosis_services_conf_broken": "Configuration is broken for service {service}!",
     "diagnosis_services_bad_status": "Service {service} is {status} :(",
+    "diagnosis_services_bad_status_tip": "You can try to restart the service, and if it doesn't work, have a look at the service logs using 'yunohost service log {0}' or through the 'Services' section of the webadmin.",
     "diagnosis_diskusage_verylow": "Storage {mountpoint} (on device {device}) has only {free_abs_GB} GB ({free_percent}%) space remaining. You should really consider cleaning up some space.",
     "diagnosis_diskusage_low": "Storage {mountpoint} (on device {device}) has only {free_abs_GB} GB ({free_percent}%) space remaining. Be careful.",
     "diagnosis_diskusage_ok": "Storage {mountpoint} (on device {device}) still has {free_abs_GB} GB ({free_percent}%) space left!",