diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css
index 632ec2e0e5..d6296f63f9 100644
--- a/InvenTree/InvenTree/static/css/inventree.css
+++ b/InvenTree/InvenTree/static/css/inventree.css
@@ -34,8 +34,7 @@
 }
 
 .login-header {
-    padding-right: 30px;
-    margin-right: 30px;
+    margin-right: 5px;
 }
 
 .login-container input {
diff --git a/InvenTree/templates/account/base.html b/InvenTree/templates/account/base.html
index 7f2486bfcc..ea3795e87c 100644
--- a/InvenTree/templates/account/base.html
+++ b/InvenTree/templates/account/base.html
@@ -71,9 +71,12 @@
                     {% include "spacer.html" %}
                     <span class='float-right'><h3>{% inventree_title %}</h3></span>
                 </div>
-                <hr>
-                <div class='container-fluid'>{% block content %}{% endblock %}</div>
             </div>
+                <div class='container-fluid'>
+                    <hr>
+                    {% block content %}
+                    {% endblock %}
+                </div>
         </div>
         </div>
 
diff --git a/InvenTree/templates/account/login.html b/InvenTree/templates/account/login.html
index 73c49e46c0..fbe48224b4 100644
--- a/InvenTree/templates/account/login.html
+++ b/InvenTree/templates/account/login.html
@@ -32,6 +32,7 @@ for a account and sign in below:{% endblocktrans %}</p>
   <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
   {% endif %}
 
+  <hr>
   <div class="btn-group float-right" role="group">
     <button class="btn btn-success" type="submit">{% trans "Sign In" %}</button>
   </div>
diff --git a/InvenTree/templates/account/logout.html b/InvenTree/templates/account/logout.html
index 7268599bb2..df37c76be4 100644
--- a/InvenTree/templates/account/logout.html
+++ b/InvenTree/templates/account/logout.html
@@ -14,6 +14,7 @@
   {% if redirect_field_value %}
   <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}"/>
   {% endif %}
+  <hr>
   <div class='btn-group float-right' role='group'>
     <a type='button' class='btn btn-secondary' href='{% url "index" %}'><span class='fas fa-undo-alt'></span> {% trans "Back to Site" %}</a>
     <button type="submit" class="btn btn-danger btn-block">{% trans 'Sign Out' %}</button>