diff --git a/templates/base.twig b/templates/base.twig
index d7fdd353353fc7c79c4d0a4577be64b82d3660e5..25ede327bb3da2d6bd72b641c1425f2216faefd5 100644
--- a/templates/base.twig
+++ b/templates/base.twig
@@ -22,7 +22,12 @@
         <div id="content">
             <div class="wrap">
             {% if not isProduction -%}
-            <div class="message-box warning">{{ 'pre-production-warning' | trans }}</div>
+            <div class="message-box warning">{{ (
+"You are now accessing a pre-production system. This authentication setup " ~
+"is for testing and pre-production verification only. If someone sent you " ~
+"a link that pointed you here, and you are not <i>a tester</i> you " ~
+"probably got the wrong link, and should <b>not be here</b>."
+) | trans | raw }}</div>
             {% endif -%}
                 {% block contentwrapper -%}
                     {% block content %}{% endblock -%}
diff --git a/templates/includes/header.php b/templates/includes/header.php
index 6ddad9279fe0ffe99305c0dcde30b288a20bbd16..deefedecba27a1ea37772d163774b8d657ed950d 100644
--- a/templates/includes/header.php
+++ b/templates/includes/header.php
@@ -208,5 +208,5 @@ if (!empty($this->data['htmlinject']['htmlContentPre'])) {
 }
 $config = \SimpleSAML\Configuration::getInstance();
 if(! $config->getBoolean('production', true)) {
-  echo '<div class="caution">' . $this->t('{preprodwarning:warning:warning}'). '</div>';
+    echo '<div class="caution">' . $this->t('{preprodwarning:warning:warning}'). '</div>';
 }