diff --git a/aleksis/core/settings.py b/aleksis/core/settings.py
index 22fa0ec43d0312289bfb453693ce8db915f866c1..5bbf6c4e2c948823d652fd07bb1091cc1a3770e8 100644
--- a/aleksis/core/settings.py
+++ b/aleksis/core/settings.py
@@ -424,7 +424,7 @@ if _settings.get("twilio.sid", None):
     TWILIO_CALLER_ID = _settings.get("twilio.callerid")
 
 if _settings.get("celery.enabled", False):
-    INSTALLED_APPS += ("django_celery_beat", "django_celery_results")
+    INSTALLED_APPS += ("django_celery_beat", "django_celery_results", "health_check.contrib.celery")
     CELERY_BROKER_URL = _settings.get("celery.broker", "redis://localhost")
     CELERY_RESULT_BACKEND = "django-db"
     CELERY_CACHE_BACKEND = "django-cache"
@@ -654,7 +654,6 @@ elif HAYSTACK_BACKEND_SHORT == "whoosh":
 
 if _settings.get("celery.enabled", False) and _settings.get("search.celery", True):
     INSTALLED_APPS.append("celery_haystack")
-    INSTALLED_APPS.append("health_check.contrib.celery")
     HAYSTACK_SIGNAL_PROCESSOR = "celery_haystack.signals.CelerySignalProcessor"
 else:
     HAYSTACK_SIGNAL_PROCESSOR = "haystack.signals.RealtimeSignalProcessor"
diff --git a/aleksis/core/templates/core/pages/system_status.html b/aleksis/core/templates/core/pages/system_status.html
index f2c3eda35b1a97da6b8b0f5296e571496f719935..f1493bbf857f7c5769535fc48551d618abe5c24c 100644
--- a/aleksis/core/templates/core/pages/system_status.html
+++ b/aleksis/core/templates/core/pages/system_status.html
@@ -63,6 +63,7 @@
     </div>
   </div>
 
+  {# Health checks #}
   <div class="card">
     <div class="card-content">
       <span class="card-title"> {% blocktrans %}System health checks{% endblocktrans %}</span>
@@ -80,11 +81,13 @@
           {% for plugin in plugins %}
             <tr>
               <td>
+                <a class="tooltipped" data-position="top" data-tooltip="{{ plugin.pretty_status }}">
                 {% if plugin.status %}
                   <i class="material-icons green-text" aria-hidden="true">check</i>
                 {% else %}
                   <i class="material-icons red-text" aria-hidden="true">warning</i>
                 {% endif %}
+                </a>
               </td>
               <td>{{ plugin.identifier }}</td>
               <td>