diff --git a/InvenTree/templates/InvenTree/settings/user.html b/InvenTree/templates/InvenTree/settings/user.html
index 1b5e507047..aaf16cf853 100644
--- a/InvenTree/templates/InvenTree/settings/user.html
+++ b/InvenTree/templates/InvenTree/settings/user.html
@@ -55,20 +55,26 @@
             <fieldset class="blockLabels">
 
             {% for emailaddress in user.emailaddress_set.all %}
+            <div>
                 <div class="ctrlHolder">
                     <label for="email_radio_{{forloop.counter}}" class="{% if emailaddress.primary %}primary_email{%endif%}">
-
-                    <input id="email_radio_{{forloop.counter}}" type="radio" name="email" {% if emailaddress.primary or user.emailaddress_set.count == 1 %}checked="checked"{%endif %} value="{{emailaddress.email}}"/>
-
-                {{ emailaddress.email }}
+                        
+                        <input id="email_radio_{{forloop.counter}}" type="radio" name="email" {% if emailaddress.primary or user.emailaddress_set.count == 1 %}checked="checked"{%endif %} value="{{emailaddress.email}}"/>
+                        
+                        {% if emailaddress.primary %}
+                        <b>{{ emailaddress.email }}</b>
+                        {% else %}
+                        {{ emailaddress.email }}
+                        {% endif %}
+                    </label>
                     {% if emailaddress.verified %}
-                    <span class="verified">{% trans "Verified" %}</span>
+                    <span class='badge badge-right rounded-pill bg-success'>{% trans "Verified" %}</span>
                     {% else %}
-                    <span class="unverified">{% trans "Unverified" %}</span>
+                    <span class='badge badge-right rounded-pill bg-warning'>{% trans "Unverified" %}</span>
                     {% endif %}
-                    {% if emailaddress.primary %}<span class="primary">{% trans "Primary" %}</span>{% endif %}
-                </label>
+                    {% if emailaddress.primary %}<span class='badge badge-right rounded-pill bg-primary'>{% trans "Primary" %}</span>{% endif %}
                 </div>
+            </div>
             {% endfor %}
 
             <div class="buttonHolder">