diff --git a/resources/views/auth/login.twig b/resources/views/auth/login.twig
index f0ab30b5bd..88353375a6 100644
--- a/resources/views/auth/login.twig
+++ b/resources/views/auth/login.twig
@@ -1,18 +1,17 @@
 {% extends "./layout/guest" %}
 
 {% block content %}
-
     {% if IS_DEMO_SITE %}
         <div class="row">
             <div class="col-lg-12">
                 <p class="well">
-                Welcome to the Firefly III demonstration website!<br />
-                    <br />
+                    Welcome to the Firefly III demonstration website!<br/>
+                    <br/>
                     To log in, please use email address <strong>{{ DEMO_USERNAME }}</strong> with password <strong>{{ DEMO_PASSWORD }}</strong>
                 </p>
             </div>
         </div>
-{% endif %}
+    {% endif %}
 
     {% if errors.has('email') %}
         <div class="row">
diff --git a/resources/views/demo/no-demo-text.twig b/resources/views/demo/no-demo-text.twig
new file mode 100644
index 0000000000..193d1f751e
--- /dev/null
+++ b/resources/views/demo/no-demo-text.twig
@@ -0,0 +1,3 @@
+Sorry, there is no extra demo-explanation text for <abbr title="page: {{ Route.getCurrentRoute.getName }}">this page</abbr>.
+
+However, the <i class="fa fa-question-circle"></i>-icon in the top right corner may tell you more.
\ No newline at end of file
diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig
index 54dd27bce6..670580a85a 100644
--- a/resources/views/layout/default.twig
+++ b/resources/views/layout/default.twig
@@ -112,11 +112,20 @@
         <section class="content-header">
             {% include('partials.page-header') %}
             {% block breadcrumbs %}{% endblock %}
-
         </section>
 
         <!-- Main content -->
         <section class="content">
+            {% if IS_DEMO_SITE %}
+                <div class="row">
+                    <div class="col-lg-12">
+                        <p class="well">
+                            {% include ['demo.no-demo-text', 'demo.' ~ Route.getCurrentRoute.getName] %}
+                        </p>
+                    </div>
+                </div>
+            {% endif %}
+
             {% include('partials.flashes') %}
 
             <!-- actual content -->