diff --git a/InvenTree/templates/503.html b/InvenTree/templates/503.html
index 8cef12212d..fbee60c694 100644
--- a/InvenTree/templates/503.html
+++ b/InvenTree/templates/503.html
@@ -1,17 +1,73 @@
-{% extends "auth_base.html" %}
+{% extends "skeleton.html" %}
+{% load static %}
 {% load i18n %}
 
-
 {% block head %}
 <meta http-equiv="refresh" content="30">
 {% endblock %}
 
 {% block page_title %}
-    {% trans 'Site is in Maintenance' %}
+{% trans 'Site is in Maintenance' %}
 {% endblock %}
 
-{% block body_title %}{% trans 'Site is in Maintenance' %}{% endblock %}
+{% block body_class %}login-screen{% endblock %}
 
-{% block content %}
-{% trans 'The site is currently in maintenance and should be up again soon!' %}
-{% endblock %}
\ No newline at end of file
+{% block body %}
+    <!-- 
+        Background Image Attribution: https://unsplash.com/photos/Ixvv3YZkd7w
+    -->
+    <div class='container-fluid'>
+        <div class='notification-area' id='alerts'>
+            <!-- Div for displayed alerts -->
+        </div>
+    </div>
+
+    <div class='main body-wrapper login-screen d-flex'>
+
+
+        <div class='login-container'>
+        <div class="row">
+            <div class='container-fluid'>
+
+                <div class='clearfix content-heading login-header d-flex flex-wrap'>
+                    <img class="pull-left" src="{% static 'img/inventree.png' %}" width="60" height="60"/>
+                    {% include "spacer.html" %}
+                    <span class='float-right'><h3>{% block body_title %}{% trans 'Site is in Maintenance' %}{% endblock %}</h3></span>
+                </div>
+            </div>
+                <div class='container-fluid'>
+                    <hr>
+                    {% block content %}
+                    {% trans 'The site is currently in maintenance and should be up again soon!' %}
+                    {% endblock %}
+                </div>
+        </div>
+        </div>
+
+        {% block extra_body %}
+        {% endblock %}
+    </div>
+{% endblock %}
+
+{% block js_base %}
+<script type='text/javascript'>
+$(document).ready(function () {
+    // notifications
+    {% if messages %}
+    {% for message in messages %}
+    showAlertOrCache(
+        '{{ message }}',
+        true,
+        {
+            style: 'info',
+        }
+    );
+    {% endfor %}
+    {% endif %}
+
+    inventreeDocReady();
+});
+</script>
+{% endblock %}
+</body>
+</html>
diff --git a/InvenTree/templates/auth_base.html b/InvenTree/templates/auth_base.html
deleted file mode 100644
index 603b417e78..0000000000
--- a/InvenTree/templates/auth_base.html
+++ /dev/null
@@ -1,69 +0,0 @@
-{% extends "skeleton.html" %}
-{% load static %}
-{% load i18n %}
-{% load inventree_extras %}
-
-{% block page_title %}
-{% inventree_title %} | {% block head_title %}{% endblock %}
-{% endblock %}
-
-{% block body_class %}login-screen{% endblock %}
-
-{% block body %}
-    <!-- 
-        Background Image Attribution: https://unsplash.com/photos/Ixvv3YZkd7w
-    -->
-    <div class='container-fluid'>
-        <div class='notification-area' id='alerts'>
-            <!-- Div for displayed alerts -->
-        </div>
-    </div>
-
-    <div class='main body-wrapper login-screen d-flex'>
-
-
-        <div class='login-container'>
-        <div class="row">
-            <div class='container-fluid'>
-
-                <div class='clearfix content-heading login-header d-flex flex-wrap'>
-                    <img class="pull-left" src="{% static 'img/inventree.png' %}" width="60" height="60"/>
-                    {% include "spacer.html" %}
-                    <span class='float-right'><h3>{% block body_title %}{% inventree_title %}{% endblock %}</h3></span>
-                </div>
-            </div>
-                <div class='container-fluid'>
-                    <hr>
-                    {% block content %}
-                    {% endblock %}
-                </div>
-        </div>
-        </div>
-
-        {% block extra_body %}
-        {% endblock %}
-    </div>
-{% endblock %}
-
-{% block js_base %}
-<script type='text/javascript'>
-$(document).ready(function () {
-    // notifications
-    {% if messages %}
-    {% for message in messages %}
-    showAlertOrCache(
-        '{{ message }}',
-        true,
-        {
-            style: 'info',
-        }
-    );
-    {% endfor %}
-    {% endif %}
-
-    inventreeDocReady();
-});
-</script>
-{% endblock %}
-</body>
-</html>
\ No newline at end of file