diff --git a/InvenTree/InvenTree/views.py b/InvenTree/InvenTree/views.py
index a8b9b792fc..6d99e12ef8 100644
--- a/InvenTree/InvenTree/views.py
+++ b/InvenTree/InvenTree/views.py
@@ -17,13 +17,17 @@ from django.urls import reverse_lazy
 from django.shortcuts import redirect
 from django.conf import settings
 
-from django.contrib.auth.mixins import PermissionRequiredMixin
+from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin
 
 from django.views import View
 from django.views.generic import ListView, DetailView, CreateView, FormView, DeleteView, UpdateView
 from django.views.generic.base import RedirectView, TemplateView
 
 from djmoney.contrib.exchange.models import ExchangeBackend, Rate
+from allauth.account.forms import AddEmailForm
+from allauth.account.models import EmailAddress
+from allauth.account.views import EmailView
+
 from common.settings import currency_code_default, currency_codes
 
 from part.models import Part, PartCategory
@@ -810,6 +814,10 @@ class SettingsView(TemplateView):
         except:
             ctx["locale_stats"] = {}
 
+        # Forms and context for allauth
+        ctx['add_email_form'] = AddEmailForm
+        ctx["can_add_email"] = EmailAddress.objects.can_add_email(self.request.user)
+
         return ctx
 
 class CustomEmailView(LoginRequiredMixin, EmailView):
diff --git a/InvenTree/templates/InvenTree/settings/user.html b/InvenTree/templates/InvenTree/settings/user.html
index 1acad0bb87..39309eab73 100644
--- a/InvenTree/templates/InvenTree/settings/user.html
+++ b/InvenTree/templates/InvenTree/settings/user.html
@@ -39,6 +39,63 @@
     </tr>
 </table>
 
+<div class='panel-heading'>
+    <h4>{% trans "E-Mail" %}</h4>
+</div>
+
+<div>
+    {% if user.emailaddress_set.all %}
+    <p>{% trans 'The following e-mail addresses are associated with your account:' %}</p>
+
+    <form action="{% url 'account_email' %}" class="email_list" method="post">
+    {% csrf_token %}
+        <fieldset class="blockLabels">
+
+        {% for emailaddress in user.emailaddress_set.all %}
+            <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 }}
+                {% if emailaddress.verified %}
+                <span class="verified">{% trans "Verified" %}</span>
+                {% else %}
+                <span class="unverified">{% trans "Unverified" %}</span>
+                {% endif %}
+                {% if emailaddress.primary %}<span class="primary">{% trans "Primary" %}</span>{% endif %}
+            </label>
+            </div>
+        {% endfor %}
+
+        <div class="buttonHolder">
+            <button class="secondaryAction" type="submit" name="action_primary" >{% trans 'Make Primary' %}</button>
+            <button class="secondaryAction" type="submit" name="action_send" >{% trans 'Re-send Verification' %}</button>
+            <button class="primaryAction" type="submit" name="action_remove" >{% trans 'Remove' %}</button>
+        </div>
+
+        </fieldset>
+    </form>
+
+    {% else %}
+    <p><strong>{% trans 'Warning:'%}</strong>
+        {% trans "You currently do not have any e-mail address set up. You should really add an e-mail address so you can receive notifications, reset your password, etc." %}
+    </p>
+
+    {% endif %}
+
+    {% if can_add_email %}
+        <h2>{% trans "Add E-mail Address" %}</h2>
+
+        <form method="post" action="{% url 'account_email' %}" class="add_email">
+            {% csrf_token %}
+            {{ add_email_form.as_p }}
+            <button name="action_add" type="submit">{% trans "Add E-mail" %}</button>
+        </form>
+    {% endif %}
+    <br>
+</div>
+
 <div class='panel-heading'>
     <h4>{% trans "Social Accounts" %}</h4>
 </div>
@@ -156,4 +213,18 @@
     </div>
 </div>
 
+{% endblock %}
+
+{% block js_ready %}
+(function() {
+  var message = "{% trans 'Do you really want to remove the selected e-mail address?' %}";
+  var actions = document.getElementsByName('action_remove');
+  if (actions.length) {
+    actions[0].addEventListener("click", function(e) {
+      if (! confirm(message)) {
+        e.preventDefault();
+      }
+    });
+  }
+})();
 {% endblock %}
\ No newline at end of file