diff --git a/biscuit/core/settings.py b/biscuit/core/settings.py
index c62d4234848afac1d3d86ff13caf73e2834d969c..7dd2603890ad54eeccfab1fd7032a2ea21dd06d4 100644
--- a/biscuit/core/settings.py
+++ b/biscuit/core/settings.py
@@ -283,13 +283,14 @@ if _settings.get('mail.server.host', None):
         EMAIL_HOST_USER = _settings.get('mail.server.user')
         EMAIL_HOST_PASSWORD = _settings.get('mail.server.password')
 
-TEMPLATE_VISIBLE_SETTINGS = ['ADMINS']
+TEMPLATE_VISIBLE_SETTINGS = ['ADMINS', 'DEBUG']
 
 MAINTENANCE_MODE = _settings.get('maintenance.enabled', None)
 MAINTENANCE_MODE_IGNORE_IP_ADDRESSES = _settings.get(
     'maintenance.ignore_ips', _settings.get('debug.internal_ips', []))
 MAINTENANCE_MODE_GET_CLIENT_IP_ADDRESS = 'ipware.ip.get_ip'
 MAINTENANCE_MODE_IGNORE_SUPERUSER = True
+MAINTENANCE_MODE_STATE_FILE_PATH = _settings.get('maintenance.statefile', 'maintenance_mode_state.txt')
 
 IMPERSONATE = {
     'USE_HTTP_REFERER': True,
diff --git a/biscuit/core/templates/core/system_status.html b/biscuit/core/templates/core/system_status.html
index af25ccb7d1d157931fbc358fa8e36d7403b5e1f3..881a244811787bd157ea45add6a93fce8319e1cd 100644
--- a/biscuit/core/templates/core/system_status.html
+++ b/biscuit/core/templates/core/system_status.html
@@ -7,6 +7,44 @@
 {% block page_title %}{% blocktrans %}System status{% endblocktrans %}{% endblock %}
 
 {% block content %}
+  <div class="card">
+    <div class="card-header bg-light text-dark">
+      {% blocktrans %}System checks{% endblocktrans %}
+    </div>
+    <ul class="list-group list-group-flush">
+      <li class="list-group-item d-flex justify-content-between align-items-center">
+       {% if maintenance_mode %} 
+        <div>
+          <p>{% blocktrans %}Maintenance mode enabled{% endblocktrans %}</p>
+          <p class="small">{% blocktrans%}Only admin and visitors from internal IPs can access the site.{% endblocktrans %}</p>
+        </div>
+        <span class="badge badge-danger"><a href="{% url 'maintenance_mode_off' %}">{% fa 'power-off' %}</a></span>
+       {% else %}
+        <div>
+          <p>{% blocktrans %}Maintenance mode disabled{% endblocktrans %}</p>
+          <p class="small">{% blocktrans%}Everyone can access the site.{% endblocktrans %}</p>
+        </div>
+        <span class="badge badge-success"><a href="{% url 'maintenance_mode_on' %}">{% fa 'power-off' %}</a></span>
+       {% endif %}
+      </li>
+      <li class="list-group-item d-flex justify-content-between align-items-center">
+       {% if DEBUG %}
+        <div>
+          <p>{% blocktrans %}Debug mode enabled{% endblocktrans %}</p>
+          <p class="small">{% blocktrans%}The web server throws back debug information on errors. Do not use in production!{% endblocktrans %}</p>
+        </div>
+        <span class="badge badge-danger">{% fa 'power-off' %}</span>
+       {% else %}
+        <div>
+          <p>{% blocktrans %}Debug mode disabled{% endblocktrans %}</p>
+          <p class="small">{% blocktrans%}Debug mode is disabled. Default error pages are displayed on errors.{% endblocktrans %}</p>
+        </div>
+        <span class="badge badge-success">{% fa 'power-off' %}</span>
+        {% endif %}
+      </li>
+    </ul>
+  </div>
+
   <div class="card">
     <div class="card-header bg-light text-dark">
       {% blocktrans %}Recent backup cron jobs{% endblocktrans %}