diff --git a/InvenTree/templates/InvenTree/settings/user.html b/InvenTree/templates/InvenTree/settings/user.html
index 4d6c33b222..2813590b23 100644
--- a/InvenTree/templates/InvenTree/settings/user.html
+++ b/InvenTree/templates/InvenTree/settings/user.html
@@ -38,11 +38,12 @@
     </tr>
 </table>
 
-<div class='panel-heading'>
-    <h4>{% trans "Email" %}</h4>
-</div>
+<div class="row">
+    <div class='panel-heading'>
+        <h4>{% trans "Email" %}</h4>
+    </div>
 
-<div>
+    <div class="col-md-6">
     {% if user.emailaddress_set.all %}
     <p>{% trans 'The following email addresses are associated with your account:' %}</p>
 
@@ -84,9 +85,10 @@
     </p>
 
     {% endif %}
+    </div>
 
     {% if can_add_email %}
-    <br>
+    <div class="col-md-6">
     <h5>{% trans "Add Email Address" %}</h5>
 
     <form method="post" action="{% url 'account_email' %}" class="add_email">
@@ -94,70 +96,70 @@
         {{ add_email_form|crispy }}
         <button class="btn btn-primary" name="action_add" type="submit">{% trans "Add Email" %}</button>
     </form>
-    {% endif %}
-    <br>
-</div>
-
-<div class='panel-heading'>
-    <h4>{% trans "Social Accounts" %}</h4>
-</div>
-
-<div>
-    {% if social_form.accounts %}
-    <p>{% blocktrans %}You can sign in to your account using any of the following third party accounts:{% endblocktrans %}</p>
-
-
-    <form method="post" action="{% url 'socialaccount_connections' %}">
-        {% csrf_token %}
-
-        <fieldset>
-            {% if social_form.non_field_errors %}
-            <div id="errorMsg">{{ social_form.non_field_errors }}</div>
-            {% endif %}
-
-            {% for base_account in social_form.accounts %}
-            {% with base_account.get_provider_account as account %}
-            <div>
-                <label for="id_account_{{ base_account.id }}">
-                    <input id="id_account_{{ base_account.id }}" type="radio" name="account"
-                        value="{{ base_account.id }}" />
-                    <span class="socialaccount_provider {{ base_account.provider }} {{ account.get_brand.id }}">
-                        <span class='brand-icon'
-                            brand_name='{{account.get_brand.id}}'></span>{{account.get_brand.name}}</span>
-                    {{ account }}
-                </label>
-            </div>
-            {% endwith %}
-            {% endfor %}
-
-            <div>
-                <button class="btn btn-primary" type="submit">{% trans 'Remove' %}</button>
-            </div>
-
-        </fieldset>
-
-    </form>
-
-    {% else %}
-    <p>{% trans 'You currently have no social network accounts connected to this account.' %}</p>
-    {% endif %}
-
-    <br>
-    <h4>{% trans 'Add a 3rd Party Account' %}</h4>
-    <div>
-        {% include "socialaccount/snippets/provider_list.html" with process="connect" %}
     </div>
-    {% include "socialaccount/snippets/login_extra.html" %}
-    <br>
-
+    {% endif %}
 </div>
 
+<div class="row">
+    <div class='panel-heading'>
+        <h4>{% trans "Social Accounts" %}</h4>
+    </div>
 
-<div class='panel-heading'>
-    <h4>{% trans "Theme Settings" %}</h4>
+    <div class="col-md-6">
+        {% if social_form.accounts %}
+        <p>{% blocktrans %}You can sign in to your account using any of the following third party accounts:{% endblocktrans %}</p>
+
+
+        <form method="post" action="{% url 'socialaccount_connections' %}">
+            {% csrf_token %}
+
+            <fieldset>
+                {% if social_form.non_field_errors %}
+                <div id="errorMsg">{{ social_form.non_field_errors }}</div>
+                {% endif %}
+
+                {% for base_account in social_form.accounts %}
+                {% with base_account.get_provider_account as account %}
+                <div>
+                    <label for="id_account_{{ base_account.id }}">
+                        <input id="id_account_{{ base_account.id }}" type="radio" name="account"
+                            value="{{ base_account.id }}" />
+                        <span class="socialaccount_provider {{ base_account.provider }} {{ account.get_brand.id }}">
+                            <span class='brand-icon'
+                                brand_name='{{account.get_brand.id}}'></span>{{account.get_brand.name}}</span>
+                        {{ account }}
+                    </label>
+                </div>
+                {% endwith %}
+                {% endfor %}
+
+                <div>
+                    <button class="btn btn-primary" type="submit">{% trans 'Remove' %}</button>
+                </div>
+
+            </fieldset>
+
+        </form>
+
+        {% else %}
+        <p>{% trans 'You currently have no social network accounts connected to this account.' %}</p>
+        {% endif %}
+    </div>
+
+    <div class="col-md-6">
+        <h5>{% trans 'Add a 3rd Party Account' %}</h5>
+        <div>
+            {% include "socialaccount/snippets/provider_list.html" with process="connect" %}
+        </div>
+        {% include "socialaccount/snippets/login_extra.html" %}
+    </div>
 </div>
 
+
 <div class='row'>
+    <div class='panel-heading'>
+        <h4>{% trans "Theme Settings" %}</h4>
+    </div>
 
     <form action='{% url "settings-appearance" %}' method='post'>
         {% csrf_token %}
@@ -181,11 +183,11 @@
 
 </div>
 
-<div class='panel-heading'>
-    <h4>{% trans "Language Settings" %}</h4>
-</div>
-
 <div class="row">
+    <div class='panel-heading'>
+        <h4>{% trans "Language Settings" %}</h4>
+    </div>
+
     <div class="col">
         <form action="{% url 'set_language' %}" method="post">
             {% csrf_token %}