diff --git a/app/templates/base.html b/app/templates/base.html
index 8a6497d..51348d6 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -23,14 +23,6 @@
                 </div>
             </div>
         {% endif %}
-        {% if config.show_admin_message %}
-            <div class="ui warning message">
-                <div class="header">
-                    {{config.admin_message_title}}
-                </div>
-                    {{config.admin_message}}
-            </div>
-        {% endif %}
         
         <div class="ui icon menu overflow-auto">
             <a href="{{ url_for('index') }}"><div class="item">
diff --git a/app/templates/home.html b/app/templates/home.html
index c98a913..3b59ffb 100644
--- a/app/templates/home.html
+++ b/app/templates/home.html
@@ -37,6 +37,17 @@
     }
 </style>
 
+{% if config.show_admin_message %}
+    <div class="text container ui">
+        <div class="ui warning message">
+            <div class="header">
+                {{config.admin_message_title}}
+            </div>
+                {{config.admin_message}}
+        </div>
+    </div>
+{% endif %}
+
 <div style="margin: 2em" class="ui one column centered grid">
     <div class="row">
         <div class="column">
diff --git a/app/templates/login.html b/app/templates/login.html
index 9a8c11d..523e67b 100644
--- a/app/templates/login.html
+++ b/app/templates/login.html
@@ -1,6 +1,16 @@
 {% extends "base.html" %}
 
 {% block content %}
+    {% if config.show_admin_message %}
+    <div class="text container ui">
+        <div class="ui warning message">
+            <div class="header">
+                {{config.admin_message_title}}
+            </div>
+                {{config.admin_message}}
+        </div>
+    </div>
+    {% endif %}
     <h2 class="ui centered header">Login</h2>
     <div class="ui grid">
     <div class="ui one column stackable center aligned page grid" id="container">