diff --git a/InvenTree/locale/de/LC_MESSAGES/django.po b/InvenTree/locale/de/LC_MESSAGES/django.po
index b1e7391734..4461f8da26 100644
--- a/InvenTree/locale/de/LC_MESSAGES/django.po
+++ b/InvenTree/locale/de/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-11 01:01+0000\n"
+"POT-Creation-Date: 2021-10-11 06:21+0000\n"
 "PO-Revision-Date: 2021-09-12 13:44\n"
 "Last-Translator: \n"
 "Language-Team: German\n"
@@ -33,41 +33,56 @@ msgstr "Keine passende Aktion gefunden"
 msgid "Enter date"
 msgstr "Datum eingeben"
 
-#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:116 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:173 build/forms.py:215 order/forms.py:27
 #: order/forms.py:38 order/forms.py:49 order/forms.py:60 order/forms.py:71
-#: part/forms.py:108 templates/js/translated/forms.js:564
+#: part/forms.py:108 templates/account/email_confirm.html:20
+#: templates/js/translated/forms.js:564
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: InvenTree/forms.py:127
+#: InvenTree/forms.py:132
 msgid "Confirm delete"
 msgstr "Löschung bestätigen"
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:133
 msgid "Confirm item deletion"
 msgstr "Löschung von Position bestätigen"
 
-#: InvenTree/forms.py:160 templates/registration/login.html:76
+#: InvenTree/forms.py:164
 msgid "Enter password"
 msgstr "Passwort eingeben"
 
-#: InvenTree/forms.py:161
+#: InvenTree/forms.py:165
 msgid "Enter new password"
 msgstr "Neues Passwort eingeben"
 
-#: InvenTree/forms.py:168
+#: InvenTree/forms.py:172
 msgid "Confirm password"
 msgstr "Passwort wiederholen"
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:173
 msgid "Confirm new password"
 msgstr "Neues Passwort bestätigen"
 
-#: InvenTree/forms.py:201
+#: InvenTree/forms.py:205
 msgid "Select Category"
 msgstr "Kategorie auswählen"
 
+#: InvenTree/forms.py:226
+msgid "E-mail (again)"
+msgstr ""
+
+#: InvenTree/forms.py:230
+#, fuzzy
+#| msgid "Edit order information"
+msgid "E-mail address confirmation"
+msgstr "Bestellung bearbeiten"
+
+#: InvenTree/forms.py:250
+msgid "You must type the same email each time."
+msgstr ""
+
 #: InvenTree/helpers.py:401
 #, python-brace-format
 msgid "Duplicate serial: {n}"
@@ -118,8 +133,8 @@ msgstr "Kommentar"
 msgid "File comment"
 msgstr "Datei-Kommentar"
 
-#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1011
-#: common/models.py:1012 part/models.py:2055
+#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1055
+#: common/models.py:1056 part/models.py:2055
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/translated/stock.js:1669
 msgid "User"
@@ -205,75 +220,75 @@ msgstr "Muss eine gültige Nummer sein"
 msgid "Filename"
 msgstr "Dateiname"
 
-#: InvenTree/settings.py:523
+#: InvenTree/settings.py:529
 msgid "German"
 msgstr "Deutsch"
 
-#: InvenTree/settings.py:524
+#: InvenTree/settings.py:530
 msgid "Greek"
 msgstr "Griechisch"
 
-#: InvenTree/settings.py:525
+#: InvenTree/settings.py:531
 msgid "English"
 msgstr "Englisch"
 
-#: InvenTree/settings.py:526
+#: InvenTree/settings.py:532
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: InvenTree/settings.py:527
+#: InvenTree/settings.py:533
 msgid "French"
 msgstr "Französisch"
 
-#: InvenTree/settings.py:528
+#: InvenTree/settings.py:534
 msgid "Hebrew"
 msgstr "Hebräisch"
 
-#: InvenTree/settings.py:529
+#: InvenTree/settings.py:535
 msgid "Italian"
 msgstr "Italienisch"
 
-#: InvenTree/settings.py:530
+#: InvenTree/settings.py:536
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: InvenTree/settings.py:531
+#: InvenTree/settings.py:537
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: InvenTree/settings.py:532
+#: InvenTree/settings.py:538
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: InvenTree/settings.py:533
+#: InvenTree/settings.py:539
 msgid "Norwegian"
 msgstr "Norwegisch"
 
-#: InvenTree/settings.py:534
+#: InvenTree/settings.py:540
 msgid "Polish"
 msgstr "Polnisch"
 
-#: InvenTree/settings.py:535
+#: InvenTree/settings.py:541
 msgid "Russian"
 msgstr "Russisch"
 
-#: InvenTree/settings.py:536
+#: InvenTree/settings.py:542
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: InvenTree/settings.py:537
+#: InvenTree/settings.py:543
 msgid "Thai"
 msgstr "Thailändisch"
 
-#: InvenTree/settings.py:538
+#: InvenTree/settings.py:544
 msgid "Turkish"
 msgstr "Türkisch"
 
-#: InvenTree/settings.py:539
+#: InvenTree/settings.py:545
 msgid "Vietnamese"
 msgstr "Vietnamesisch"
 
-#: InvenTree/settings.py:540
+#: InvenTree/settings.py:546
 msgid "Chinese"
 msgstr "Chinesisch"
 
@@ -458,27 +473,27 @@ msgstr "Überschuss darf 100% nicht überschreiten"
 msgid "Overage must be an integer value or a percentage"
 msgstr "Überschuss muss eine Ganzzahl oder ein Prozentwert sein"
 
-#: InvenTree/views.py:610
+#: InvenTree/views.py:616
 msgid "Delete Item"
 msgstr "Element löschen"
 
-#: InvenTree/views.py:659
+#: InvenTree/views.py:665
 msgid "Check box to confirm item deletion"
 msgstr "Häkchen setzen um Löschung von Objekt zu bestätigen"
 
-#: InvenTree/views.py:674 templates/InvenTree/settings/user.html:14
+#: InvenTree/views.py:680 templates/InvenTree/settings/user.html:18
 msgid "Edit User Information"
 msgstr "Benutzerinformationen bearbeiten"
 
-#: InvenTree/views.py:685 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:691 templates/InvenTree/settings/user.html:22
 msgid "Set Password"
 msgstr "Passwort eingeben"
 
-#: InvenTree/views.py:704
+#: InvenTree/views.py:710
 msgid "Password fields must match"
 msgstr "Passwörter stimmen nicht überein"
 
-#: InvenTree/views.py:910 templates/navbar.html:97
+#: InvenTree/views.py:954 templates/navbar.html:97
 msgid "System Information"
 msgstr "Systeminformationen"
 
@@ -553,7 +568,7 @@ msgstr "Zieldatum für Bauauftrag-Fertigstellung."
 #: build/forms.py:48 build/forms.py:90 build/models.py:1281
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:1043
+#: build/templates/build/detail.html:34 common/models.py:1087
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:101 order/forms.py:123 order/models.py:720
 #: order/models.py:982 order/templates/order/order_wizard/match_parts.html:30
@@ -683,8 +698,8 @@ msgstr "Bauauftrag"
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:50
 #: part/templates/part/navbar.html:53 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:171
-#: templates/InvenTree/settings/navbar.html:107
-#: templates/InvenTree/settings/navbar.html:109 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 users/models.py:44
 msgid "Build Orders"
 msgstr "Bauaufträge"
 
@@ -1560,7 +1575,7 @@ msgstr "{name.title()} Datei"
 msgid "Select {name} file to upload"
 msgstr "{name} Datei zum Hochladen auswählen"
 
-#: common/models.py:308 common/models.py:843 common/models.py:1004
+#: common/models.py:308 common/models.py:887 common/models.py:1048
 msgid "Settings key (must be unique - case insensitive"
 msgstr "Einstellungs-Schlüssel (muss einzigartig sein, Groß-/ Kleinschreibung wird nicht beachtet)"
 
@@ -1978,196 +1993,262 @@ msgstr ""
 msgid "Enable PO functionality in InvenTree interface"
 msgstr ""
 
-#: common/models.py:854
-msgid "Show starred parts"
-msgstr "Markierte Teile anzeigen"
+#: common/models.py:836
+#, fuzzy
+#| msgid "Enter password"
+msgid "Enable password forgot"
+msgstr "Passwort eingeben"
 
-#: common/models.py:855
-msgid "Show starred parts on the homepage"
-msgstr "Zeige markierte Teile auf der Startseite"
-
-#: common/models.py:860
-msgid "Show latest parts"
-msgstr "Neueste Teile anzeigen"
-
-#: common/models.py:861
-msgid "Show latest parts on the homepage"
-msgstr "Zeige neueste Teile auf der Startseite"
-
-#: common/models.py:866
-msgid "Recent Part Count"
-msgstr "Aktuelle Teile-Stände"
-
-#: common/models.py:867
-msgid "Number of recent parts to display on index page"
-msgstr "Anzahl der neusten Teile auf der Startseite"
-
-#: common/models.py:873
-msgid "Show unvalidated BOMs"
-msgstr "Nicht validierte Stücklisten anzeigen"
-
-#: common/models.py:874
-msgid "Show BOMs that await validation on the homepage"
+#: common/models.py:837
+msgid "Enable password forgot function on the login-pages"
 msgstr ""
 
-#: common/models.py:879
-msgid "Show recent stock changes"
-msgstr "Neueste Lagerbestand Änderungen anzeigen"
+#: common/models.py:842
+#, fuzzy
+#| msgid "Label description"
+msgid "Enable registration"
+msgstr "Label Beschreibung"
 
-#: common/models.py:880
-msgid "Show recently changed stock items on the homepage"
-msgstr "Zeige zuletzt geänderte Lagerbestände auf der Startseite"
+#: common/models.py:843
+msgid "Enable self-registration for users on the login-pages"
+msgstr ""
 
-#: common/models.py:885
-msgid "Recent Stock Count"
-msgstr "aktueller Bestand"
+#: common/models.py:848
+#, fuzzy
+#| msgid "Enabled"
+msgid "Enable SSO"
+msgstr "Aktiviert"
 
-#: common/models.py:886
-msgid "Number of recent stock items to display on index page"
-msgstr "Anzahl des geänderten Bestands auf der Startseite"
+#: common/models.py:849
+msgid "Enable SSO on the login-pages"
+msgstr ""
 
-#: common/models.py:891
-msgid "Show low stock"
-msgstr "Niedrigen Bestand anzeigen"
+#: common/models.py:854
+#, fuzzy
+#| msgid "Required"
+msgid "E-Mail required"
+msgstr "Benötigt"
 
-#: common/models.py:892
-msgid "Show low stock items on the homepage"
-msgstr "Zeige geringen Lagerbestand auf der Startseite"
+#: common/models.py:855
+msgid "Require user to supply mail on signup"
+msgstr ""
 
-#: common/models.py:897
-msgid "Show depleted stock"
+#: common/models.py:860
+msgid "Auto-fill SSO users"
+msgstr ""
+
+#: common/models.py:861
+msgid "Automatically fill out user-details from SSO account-data"
+msgstr ""
+
+#: common/models.py:866
+msgid "Mail twice"
+msgstr ""
+
+#: common/models.py:867
+msgid "On signup ask users twice for their mail"
+msgstr ""
+
+#: common/models.py:872
+#, fuzzy
+#| msgid "Password"
+msgid "Password twice"
+msgstr "Passwort"
+
+#: common/models.py:873
+msgid "On signup ask users twice for their password"
 msgstr ""
 
 #: common/models.py:898
+msgid "Show starred parts"
+msgstr "Markierte Teile anzeigen"
+
+#: common/models.py:899
+msgid "Show starred parts on the homepage"
+msgstr "Zeige markierte Teile auf der Startseite"
+
+#: common/models.py:904
+msgid "Show latest parts"
+msgstr "Neueste Teile anzeigen"
+
+#: common/models.py:905
+msgid "Show latest parts on the homepage"
+msgstr "Zeige neueste Teile auf der Startseite"
+
+#: common/models.py:910
+msgid "Recent Part Count"
+msgstr "Aktuelle Teile-Stände"
+
+#: common/models.py:911
+msgid "Number of recent parts to display on index page"
+msgstr "Anzahl der neusten Teile auf der Startseite"
+
+#: common/models.py:917
+msgid "Show unvalidated BOMs"
+msgstr "Nicht validierte Stücklisten anzeigen"
+
+#: common/models.py:918
+msgid "Show BOMs that await validation on the homepage"
+msgstr ""
+
+#: common/models.py:923
+msgid "Show recent stock changes"
+msgstr "Neueste Lagerbestand Änderungen anzeigen"
+
+#: common/models.py:924
+msgid "Show recently changed stock items on the homepage"
+msgstr "Zeige zuletzt geänderte Lagerbestände auf der Startseite"
+
+#: common/models.py:929
+msgid "Recent Stock Count"
+msgstr "aktueller Bestand"
+
+#: common/models.py:930
+msgid "Number of recent stock items to display on index page"
+msgstr "Anzahl des geänderten Bestands auf der Startseite"
+
+#: common/models.py:935
+msgid "Show low stock"
+msgstr "Niedrigen Bestand anzeigen"
+
+#: common/models.py:936
+msgid "Show low stock items on the homepage"
+msgstr "Zeige geringen Lagerbestand auf der Startseite"
+
+#: common/models.py:941
+msgid "Show depleted stock"
+msgstr ""
+
+#: common/models.py:942
 msgid "Show depleted stock items on the homepage"
 msgstr ""
 
-#: common/models.py:903
+#: common/models.py:947
 msgid "Show needed stock"
 msgstr "Benötigten Bestand anzeigen"
 
-#: common/models.py:904
+#: common/models.py:948
 msgid "Show stock items needed for builds on the homepage"
 msgstr "Zeige Bestand für Bauaufträge auf der Startseite"
 
-#: common/models.py:909
+#: common/models.py:953
 msgid "Show expired stock"
 msgstr "Abgelaufenen Bestand anzeigen"
 
-#: common/models.py:910
+#: common/models.py:954
 msgid "Show expired stock items on the homepage"
 msgstr "Zeige Abgelaufene Lagerbestände auf der Startseite"
 
-#: common/models.py:915
+#: common/models.py:959
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:916
+#: common/models.py:960
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:921
+#: common/models.py:965
 msgid "Show pending builds"
 msgstr "Ausstehende Bauaufträge anzeigen"
 
-#: common/models.py:922
+#: common/models.py:966
 msgid "Show pending builds on the homepage"
 msgstr "Zeige ausstehende Bauaufträge auf der Startseite"
 
-#: common/models.py:927
+#: common/models.py:971
 msgid "Show overdue builds"
 msgstr "Zeige überfällige Bauaufträge"
 
-#: common/models.py:928
+#: common/models.py:972
 msgid "Show overdue builds on the homepage"
 msgstr "Zeige überfällige Bauaufträge auf der Startseite"
 
-#: common/models.py:933
+#: common/models.py:977
 msgid "Show outstanding POs"
 msgstr "Ausstehende POs anzeigen"
 
-#: common/models.py:934
+#: common/models.py:978
 msgid "Show outstanding POs on the homepage"
 msgstr "Ausstehende POs auf der Startseite anzeigen"
 
-#: common/models.py:939
+#: common/models.py:983
 msgid "Show overdue POs"
 msgstr "Überfällige POs anzeigen"
 
-#: common/models.py:940
+#: common/models.py:984
 msgid "Show overdue POs on the homepage"
 msgstr "Überfällige POs auf der Startseite anzeigen"
 
-#: common/models.py:945
+#: common/models.py:989
 msgid "Show outstanding SOs"
 msgstr "Ausstehende SOs anzeigen"
 
-#: common/models.py:946
+#: common/models.py:990
 msgid "Show outstanding SOs on the homepage"
 msgstr "Ausstehende SOs auf der Startseite anzeigen"
 
-#: common/models.py:951
+#: common/models.py:995
 msgid "Show overdue SOs"
 msgstr "Überfällige SOs anzeigen"
 
-#: common/models.py:952
+#: common/models.py:996
 msgid "Show overdue SOs on the homepage"
 msgstr "Überfällige SOs auf der Startseite anzeigen"
 
-#: common/models.py:958
+#: common/models.py:1002
 msgid "Inline label display"
 msgstr ""
 
-#: common/models.py:959
+#: common/models.py:1003
 msgid "Display PDF labels in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:965
+#: common/models.py:1009
 msgid "Inline report display"
 msgstr "Berichte inline anzeigen"
 
-#: common/models.py:966
+#: common/models.py:1010
 msgid "Display PDF reports in the browser, instead of downloading as a file"
 msgstr "PDF-Berichte im Browser anzeigen, anstatt als Datei herunterzuladen"
 
-#: common/models.py:972
+#: common/models.py:1016
 msgid "Search Preview Results"
 msgstr "Anzahl Suchergebnisse"
 
-#: common/models.py:973
+#: common/models.py:1017
 msgid "Number of results to show in search preview window"
 msgstr "Anzahl der Ergebnisse, die in der Vorschau angezeigt werden sollen"
 
-#: common/models.py:979
+#: common/models.py:1023
 msgid "Show Quantity in Forms"
 msgstr "zeige Bestand in Eingabemasken"
 
-#: common/models.py:980
+#: common/models.py:1024
 msgid "Display available part quantity in some forms"
 msgstr "Zeige den verfügbaren Bestand in einigen Eingabemasken"
 
-#: common/models.py:986
+#: common/models.py:1030
 msgid "Escape Key Closes Forms"
 msgstr ""
 
-#: common/models.py:987
+#: common/models.py:1031
 msgid "Use the escape key to close modal forms"
 msgstr ""
 
-#: common/models.py:1044 company/forms.py:43
+#: common/models.py:1088 company/forms.py:43
 msgid "Price break quantity"
 msgstr "Preisstaffelungs Anzahl"
 
-#: common/models.py:1051 company/templates/company/supplier_part.html:231
+#: common/models.py:1095 company/templates/company/supplier_part.html:231
 #: templates/js/translated/part.js:1369
 msgid "Price"
 msgstr "Preis"
 
-#: common/models.py:1052
+#: common/models.py:1096
 msgid "Unit price at specified quantity"
 msgstr "Stückpreis für die angegebene Anzahl"
 
-#: common/models.py:1145
+#: common/models.py:1189
 msgid "Default"
 msgstr "Standard"
 
@@ -2616,8 +2697,8 @@ msgstr "Zulieferer-Bestand"
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:82
 #: part/templates/part/navbar.html:85 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:229
-#: templates/InvenTree/settings/navbar.html:113
-#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:119
+#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:44
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr "Bestellungen"
@@ -2640,8 +2721,8 @@ msgstr "Neue Bestellung"
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:91
 #: part/templates/part/navbar.html:94 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:249
-#: templates/InvenTree/settings/navbar.html:119
-#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:55
+#: templates/InvenTree/settings/navbar.html:125
+#: templates/InvenTree/settings/navbar.html:127 templates/navbar.html:55
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr "Aufträge"
@@ -2727,7 +2808,7 @@ msgstr "Zuliefererteil entfernen"
 #: company/templates/company/manufacturer_part.html:239
 #: part/templates/part/detail.html:214 part/templates/part/detail.html:294
 #: part/templates/part/detail.html:317 templates/js/translated/company.js:424
-#: templates/js/translated/helpers.js:31 users/models.py:194
+#: templates/js/translated/helpers.js:31 users/models.py:199
 msgid "Delete"
 msgstr "Löschen"
 
@@ -2776,8 +2857,8 @@ msgstr "Herstellerteil-Bestand"
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:182
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109
 #: templates/js/translated/part.js:540 templates/js/translated/part.js:769
 #: templates/js/translated/part.js:945 templates/js/translated/stock.js:182
 #: templates/js/translated/stock.js:829 templates/navbar.html:32
@@ -3741,8 +3822,8 @@ msgstr "{part} Stückpreis auf {price} und Menge auf {qty} aktualisiert"
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
 #: templates/js/translated/part.js:1165 templates/navbar.html:29
 #: templates/stats.html:80 templates/stats.html:89 users/models.py:41
 msgid "Parts"
@@ -3956,7 +4037,7 @@ msgstr "Schlüsselworte um die Sichtbarkeit in Suchergebnissen zu verbessern"
 
 #: part/models.py:696 part/models.py:2299
 #: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:168
+#: templates/InvenTree/settings/settings.html:169
 #: templates/js/translated/part.js:927
 msgid "Category"
 msgstr "Kategorie"
@@ -4146,7 +4227,7 @@ msgid "Parameter Units"
 msgstr "Einheit des Parameters"
 
 #: part/models.py:2256 part/models.py:2305 part/models.py:2306
-#: templates/InvenTree/settings/settings.html:163
+#: templates/InvenTree/settings/settings.html:164
 msgid "Parameter Template"
 msgstr "Parameter Vorlage"
 
@@ -4158,7 +4239,7 @@ msgstr "Wert"
 msgid "Parameter Value"
 msgstr "Parameter Wert"
 
-#: part/models.py:2310 templates/InvenTree/settings/settings.html:172
+#: part/models.py:2310 templates/InvenTree/settings/settings.html:173
 msgid "Default Value"
 msgstr "Standard-Wert"
 
@@ -6178,6 +6259,16 @@ msgstr "Server Einstellungen"
 msgid "Setting"
 msgstr "Einstellungen"
 
+#: templates/InvenTree/settings/login.html:9
+#, fuzzy
+#| msgid "Report Settings"
+msgid "Login Settings"
+msgstr "Berichts-Einstellungen"
+
+#: templates/InvenTree/settings/login.html:22 templates/account/signup.html:5
+msgid "Signup"
+msgstr ""
+
 #: templates/InvenTree/settings/navbar.html:12
 #: templates/InvenTree/settings/user_settings.html:9
 msgid "User Settings"
@@ -6233,22 +6324,27 @@ msgid "Server"
 msgstr "Server"
 
 #: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
-msgid "Barcodes"
-msgstr "Barcodes"
+#: templates/InvenTree/settings/navbar.html:73 templates/navbar.html:87
+msgid "Login"
+msgstr "Einloggen"
 
 #: templates/InvenTree/settings/navbar.html:77
 #: templates/InvenTree/settings/navbar.html:79
-msgid "Currencies"
-msgstr "Währungen"
+msgid "Barcodes"
+msgstr "Barcodes"
 
 #: templates/InvenTree/settings/navbar.html:83
 #: templates/InvenTree/settings/navbar.html:85
+msgid "Currencies"
+msgstr "Währungen"
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
 msgid "Reporting"
 msgstr "Berichte"
 
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103
 msgid "Categories"
 msgstr "Kategorien"
 
@@ -6289,21 +6385,21 @@ msgstr "Kein Wert angegeben"
 msgid "Edit setting"
 msgstr "Einstellungen ändern"
 
-#: templates/InvenTree/settings/settings.html:153
+#: templates/InvenTree/settings/settings.html:154
 msgid "No category parameter templates found"
 msgstr "Keine Kategorie-Parametervorlagen gefunden"
 
-#: templates/InvenTree/settings/settings.html:175
-#: templates/InvenTree/settings/settings.html:274
+#: templates/InvenTree/settings/settings.html:176
+#: templates/InvenTree/settings/settings.html:275
 msgid "Edit Template"
 msgstr "Vorlage bearbeiten"
 
-#: templates/InvenTree/settings/settings.html:176
-#: templates/InvenTree/settings/settings.html:275
+#: templates/InvenTree/settings/settings.html:177
+#: templates/InvenTree/settings/settings.html:276
 msgid "Delete Template"
 msgstr "Vorlage löschen"
 
-#: templates/InvenTree/settings/settings.html:254
+#: templates/InvenTree/settings/settings.html:255
 msgid "No part parameter templates found"
 msgstr "Keine Teilparametervorlagen gefunden"
 
@@ -6315,70 +6411,146 @@ msgstr "Auftrags-Einstellungen"
 msgid "Stock Settings"
 msgstr "Bestands-Einstellungen"
 
-#: templates/InvenTree/settings/user.html:9
+#: templates/InvenTree/settings/user.html:11
 msgid "Account Settings"
 msgstr "Kontoeinstellungen"
 
-#: templates/InvenTree/settings/user.html:15
+#: templates/InvenTree/settings/user.html:19
 #: templates/js/translated/helpers.js:26
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: templates/InvenTree/settings/user.html:17
+#: templates/InvenTree/settings/user.html:21
+#: templates/account/password_reset_from_key.html:4
+#: templates/account/password_reset_from_key.html:7
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: templates/InvenTree/settings/user.html:24
-#: templates/registration/login.html:58
+#: templates/InvenTree/settings/user.html:28
 msgid "Username"
 msgstr "Benutzername"
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:32
 msgid "First Name"
 msgstr "Vorname"
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:36
 msgid "Last Name"
 msgstr "Nachname"
 
-#: templates/InvenTree/settings/user.html:36
-msgid "Email Address"
+#: templates/InvenTree/settings/user.html:42
+msgid "E-Mail"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:47
+msgid "The following e-mail addresses are associated with your account:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:61
+msgid "Verified"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:63
+msgid "Unverified"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:65
+msgid "Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:71
+msgid "Make Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:72
+msgid "Re-send Verification"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:73
+#: templates/InvenTree/settings/user.html:130
+#, fuzzy
+#| msgid "Removed"
+msgid "Remove"
+msgstr "Entfernt"
+
+#: templates/InvenTree/settings/user.html:80
+#, fuzzy
+#| msgid "Warning"
+msgid "Warning:"
+msgstr "Warnung"
+
+#: templates/InvenTree/settings/user.html:81
+msgid "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."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:88
+#, fuzzy
+#| msgid "Email Address"
+msgid "Add E-mail Address"
 msgstr "Mail-Adresse"
 
-#: templates/InvenTree/settings/user.html:42
+#: templates/InvenTree/settings/user.html:93
+#, fuzzy
+#| msgid "Email"
+msgid "Add E-mail"
+msgstr "Email"
+
+#: templates/InvenTree/settings/user.html:100
+#, fuzzy
+#| msgid "Stock counted"
+msgid "Social Accounts"
+msgstr "Lagerbestand gezählt"
+
+#: templates/InvenTree/settings/user.html:105
+msgid "You can sign in to your account using any of the following third party accounts:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:138
+msgid "You currently have no social network accounts connected to this account."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:142
+msgid "Add a 3rd Party Account"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:153
 msgid "Theme Settings"
 msgstr "Anzeige-Einstellungen"
 
-#: templates/InvenTree/settings/user.html:63
+#: templates/InvenTree/settings/user.html:174
 msgid "Set Theme"
 msgstr "Design auswählen"
 
-#: templates/InvenTree/settings/user.html:70
+#: templates/InvenTree/settings/user.html:181
 msgid "Language Settings"
 msgstr "Spracheinstellung"
 
-#: templates/InvenTree/settings/user.html:89
+#: templates/InvenTree/settings/user.html:200
 #, python-format
 msgid "%(lang_translated)s%% translated"
 msgstr "%(lang_translated)s%% übersetzt"
 
-#: templates/InvenTree/settings/user.html:91
+#: templates/InvenTree/settings/user.html:202
 msgid "No translations available"
 msgstr "Keine Übersetzungen verfügbar"
 
-#: templates/InvenTree/settings/user.html:98
+#: templates/InvenTree/settings/user.html:209
 msgid "Set Language"
 msgstr "Sprache festlegen"
 
-#: templates/InvenTree/settings/user.html:103
+#: templates/InvenTree/settings/user.html:214
 msgid "Help the translation efforts!"
 msgstr "Hilf bei der Übersetzung!"
 
-#: templates/InvenTree/settings/user.html:104
+#: templates/InvenTree/settings/user.html:215
 #, python-format
 msgid "Native language translation of the InvenTree web application is <a href=\"%(link)s\">community contributed via crowdin</a>. Contributions are welcomed and encouraged."
 msgstr "Die Übersetzung von InvenTree wird <a href=\"%(link)s\">von Nutzern mit Crowdin</a> betrieben. Wir ermutigen zur und freuen uns über jeden Mithilfe!"
 
+#: templates/InvenTree/settings/user.html:223
+msgid "Do you really want to remove the selected e-mail address?"
+msgstr ""
+
 #: templates/InvenTree/settings/user_forms.html:9
 #, fuzzy
 #| msgid "Report Settings"
@@ -6472,6 +6644,118 @@ msgstr "Versionsinformationen kopieren"
 msgid "Close"
 msgstr "Schliessen"
 
+#: templates/account/email_confirm.html:6
+#: templates/account/email_confirm.html:10
+#, fuzzy
+#| msgid "Email Address"
+msgid "Confirm E-mail Address"
+msgstr "Mail-Adresse"
+
+#: templates/account/email_confirm.html:16
+#, python-format
+msgid "Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail address for user %(user_display)s."
+msgstr ""
+
+#: templates/account/email_confirm.html:27
+#, python-format
+msgid "This e-mail confirmation link expired or is invalid. Please <a href=\"%(email_url)s\">issue a new e-mail confirmation request</a>."
+msgstr ""
+
+#: templates/account/login.html:5 templates/account/login.html:14
+#: templates/account/login.html:36
+msgid "Sign In"
+msgstr ""
+
+#: templates/account/login.html:19
+#, python-format
+msgid ""
+"Please sign in with one\n"
+"of your existing third party accounts or  <a class=\"btn btn-primary btn-small\" href=\"%(signup_url)s\">sign up</a>\n"
+"for a account and sign in below:"
+msgstr ""
+
+#: templates/account/login.html:23
+#, python-format
+msgid ""
+"If you have not created an account yet, then please\n"
+"<a href=\"%(signup_url)s\">sign up</a> first."
+msgstr ""
+
+#: templates/account/login.html:38
+#, fuzzy
+#| msgid "Forgotten your password?"
+msgid "Forgot Password?"
+msgstr "Passwort vergessen?"
+
+#: templates/account/login.html:45
+msgid "or use SSO"
+msgstr ""
+
+#: templates/account/logout.html:5 templates/account/logout.html:8
+#: templates/account/logout.html:17
+msgid "Sign Out"
+msgstr ""
+
+#: templates/account/logout.html:10
+#, fuzzy
+#| msgid "Are you sure you want to delete this stock item?"
+msgid "Are you sure you want to sign out?"
+msgstr "Sind Sie sicher, dass Sie dieses BestandsObjekt löschen wollen?"
+
+#: templates/account/password_reset.html:5
+#: templates/account/password_reset.html:12
+#, fuzzy
+#| msgid "Password"
+msgid "Password Reset"
+msgstr "Passwort"
+
+#: templates/account/password_reset.html:18
+msgid "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it."
+msgstr ""
+
+#: templates/account/password_reset.html:23
+#, fuzzy
+#| msgid "Set Password"
+msgid "Reset My Password"
+msgstr "Passwort eingeben"
+
+#: templates/account/password_reset.html:27 templates/account/signup.html:36
+msgid "This function is currently disabled. Please contact an administrator."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:7
+msgid "Bad Token"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:11
+#, fuzzy, python-format
+#| msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset."
+msgid "The password reset link was invalid, possibly because it has already been used.  Please request a <a href=\"%(passwd_reset_url)s\">new password reset</a>."
+msgstr "Der Link zum Zurücksetzen des Kennworts war ungültig, möglicherweise, weil er bereits verwendet wurde. Bitte fordern Sie eine neue Passwortwiederherstellung an."
+
+#: templates/account/password_reset_from_key.html:17
+#, fuzzy
+#| msgid "Change password"
+msgid "change password"
+msgstr "Passwort ändern"
+
+#: templates/account/password_reset_from_key.html:20
+msgid "Your password is now changed."
+msgstr ""
+
+#: templates/account/signup.html:11 templates/account/signup.html:22
+msgid "Sign Up"
+msgstr ""
+
+#: templates/account/signup.html:13
+#, python-format
+msgid "Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>."
+msgstr ""
+
+#: templates/account/signup.html:27
+msgid "Or use a SSO-provider for signup"
+msgstr ""
+
 #: templates/image_download.html:8
 msgid "Specify URL for downloading image"
 msgstr "URL für Bild-Donwload angeben"
@@ -7649,7 +7933,7 @@ msgstr "Entfernen"
 msgid "Add Stock"
 msgstr "Bestand hinzufügen"
 
-#: templates/js/translated/stock.js:165 users/models.py:190
+#: templates/js/translated/stock.js:165 users/models.py:195
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -8106,10 +8390,6 @@ msgstr "Admin"
 msgid "Logout"
 msgstr "Ausloggen"
 
-#: templates/navbar.html:87 templates/registration/login.html:89
-msgid "Login"
-msgstr "Einloggen"
-
 #: templates/navbar.html:106
 msgid "About InvenTree"
 msgstr "Über InvenTree"
@@ -8118,69 +8398,13 @@ msgstr "Über InvenTree"
 msgid "QR data not provided"
 msgstr "QR Daten nicht angegeben"
 
-#: templates/registration/logged_out.html:50
-msgid "You have been logged out"
-msgstr "Sie wurden abgemeldet"
+#: templates/registration/logged_out.html:6
+msgid "You were logged out successfully."
+msgstr ""
 
-#: templates/registration/logged_out.html:51
-#: templates/registration/password_reset_complete.html:51
-#: templates/registration/password_reset_done.html:58
-msgid "Return to login screen"
-msgstr "Zurück zur Anmeldeseite"
-
-#: templates/registration/login.html:64
-msgid "Enter username"
-msgstr "Benutzername eingeben"
-
-#: templates/registration/login.html:70
-msgid "Password"
-msgstr "Passwort"
-
-#: templates/registration/login.html:83
-msgid "Username / password combination is incorrect"
-msgstr "Benutzername / Passwort Kombination ist falsch"
-
-#: templates/registration/login.html:95
-#: templates/registration/password_reset_form.html:51
-msgid "Forgotten your password?"
-msgstr "Passwort vergessen?"
-
-#: templates/registration/login.html:95
-msgid "Click here to reset"
-msgstr "Hier klicken zum Zurücksetzen"
-
-#: templates/registration/password_reset_complete.html:50
-msgid "Password reset complete"
-msgstr "Passwort erfolgreich zurückgesetzt"
-
-#: templates/registration/password_reset_confirm.html:52
-#: templates/registration/password_reset_confirm.html:56
-msgid "Change password"
-msgstr "Passwort ändern"
-
-#: templates/registration/password_reset_confirm.html:60
-msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset."
-msgstr "Der Link zum Zurücksetzen des Kennworts war ungültig, möglicherweise, weil er bereits verwendet wurde. Bitte fordern Sie eine neue Passwortwiederherstellung an."
-
-#: templates/registration/password_reset_done.html:51
-msgid "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly."
-msgstr "Wir haben Ihnen per E-Mail Anweisungen zum Setzen Ihres Passworts zugeschickt, falls ein Konto mit der von Ihnen eingegebenen E-Mail existiert. Sie sollten diese in Kürze erhalten."
-
-#: templates/registration/password_reset_done.html:54
-msgid "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder."
-msgstr "Wenn Sie keine E-Mail erhalten, stellen Sie sicher, dass Sie die E-Mail Adresse eingegeben haben, mit der Sie sich registriert haben, und überprüfen Sie Ihren Spam-Ordner."
-
-#: templates/registration/password_reset_form.html:52
-msgid "Enter your email address below."
-msgstr "Geben Sie Ihre E-Mail-Adresse ein."
-
-#: templates/registration/password_reset_form.html:53
-msgid "An email will be sent with password reset instructions."
-msgstr "Eine E-Mail mit Anweisungen zum Zurücksetzen des Passworts wird gesendet."
-
-#: templates/registration/password_reset_form.html:58
-msgid "Send email"
-msgstr "E-Mail senden"
+#: templates/registration/logged_out.html:8
+msgid "Log in again"
+msgstr ""
 
 #: templates/stats.html:13
 msgid "Instance Name"
@@ -8318,38 +8542,71 @@ msgstr "Berechtigungen"
 msgid "Important dates"
 msgstr "wichtige Daten"
 
-#: users/models.py:177
+#: users/models.py:182
 msgid "Permission set"
 msgstr "Berechtigung geändert"
 
-#: users/models.py:185
+#: users/models.py:190
 msgid "Group"
 msgstr "Gruppe"
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "View"
 msgstr "Ansicht"
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "Permission to view items"
 msgstr "Berechtigung Einträge anzuzeigen"
 
-#: users/models.py:190
+#: users/models.py:195
 msgid "Permission to add items"
 msgstr "Berechtigung Einträge zu erstellen"
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Change"
 msgstr "Ändern"
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Permissions to edit items"
 msgstr "Berechtigungen Einträge zu ändern"
 
-#: users/models.py:194
+#: users/models.py:199
 msgid "Permission to delete items"
 msgstr "Berechtigung Einträge zu löschen"
 
+#~ msgid "You have been logged out"
+#~ msgstr "Sie wurden abgemeldet"
+
+#~ msgid "Return to login screen"
+#~ msgstr "Zurück zur Anmeldeseite"
+
+#~ msgid "Enter username"
+#~ msgstr "Benutzername eingeben"
+
+#~ msgid "Username / password combination is incorrect"
+#~ msgstr "Benutzername / Passwort Kombination ist falsch"
+
+#~ msgid "Click here to reset"
+#~ msgstr "Hier klicken zum Zurücksetzen"
+
+#~ msgid "Password reset complete"
+#~ msgstr "Passwort erfolgreich zurückgesetzt"
+
+#~ msgid "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly."
+#~ msgstr "Wir haben Ihnen per E-Mail Anweisungen zum Setzen Ihres Passworts zugeschickt, falls ein Konto mit der von Ihnen eingegebenen E-Mail existiert. Sie sollten diese in Kürze erhalten."
+
+#~ msgid "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder."
+#~ msgstr "Wenn Sie keine E-Mail erhalten, stellen Sie sicher, dass Sie die E-Mail Adresse eingegeben haben, mit der Sie sich registriert haben, und überprüfen Sie Ihren Spam-Ordner."
+
+#~ msgid "Enter your email address below."
+#~ msgstr "Geben Sie Ihre E-Mail-Adresse ein."
+
+#~ msgid "An email will be sent with password reset instructions."
+#~ msgstr "Eine E-Mail mit Anweisungen zum Zurücksetzen des Passworts wird gesendet."
+
+#~ msgid "Send email"
+#~ msgstr "E-Mail senden"
+
 #~ msgid "This action will unallocate the following stock from the Sales Order"
 #~ msgstr "Diese Aktion wird die folgenden BestandsObjekt vom Auftrag entfernen"
 
diff --git a/InvenTree/locale/el/LC_MESSAGES/django.po b/InvenTree/locale/el/LC_MESSAGES/django.po
index 1cda525cf0..58877b57e6 100644
--- a/InvenTree/locale/el/LC_MESSAGES/django.po
+++ b/InvenTree/locale/el/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-11 01:01+0000\n"
+"POT-Creation-Date: 2021-10-11 06:21+0000\n"
 "PO-Revision-Date: 2021-09-12 13:44\n"
 "Last-Translator: \n"
 "Language-Team: Greek\n"
@@ -33,41 +33,54 @@ msgstr ""
 msgid "Enter date"
 msgstr ""
 
-#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:116 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:173 build/forms.py:215 order/forms.py:27
 #: order/forms.py:38 order/forms.py:49 order/forms.py:60 order/forms.py:71
-#: part/forms.py:108 templates/js/translated/forms.js:564
+#: part/forms.py:108 templates/account/email_confirm.html:20
+#: templates/js/translated/forms.js:564
 msgid "Confirm"
 msgstr ""
 
-#: InvenTree/forms.py:127
+#: InvenTree/forms.py:132
 msgid "Confirm delete"
 msgstr ""
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:133
 msgid "Confirm item deletion"
 msgstr ""
 
-#: InvenTree/forms.py:160 templates/registration/login.html:76
+#: InvenTree/forms.py:164
 msgid "Enter password"
 msgstr ""
 
-#: InvenTree/forms.py:161
+#: InvenTree/forms.py:165
 msgid "Enter new password"
 msgstr ""
 
-#: InvenTree/forms.py:168
+#: InvenTree/forms.py:172
 msgid "Confirm password"
 msgstr ""
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:173
 msgid "Confirm new password"
 msgstr ""
 
-#: InvenTree/forms.py:201
+#: InvenTree/forms.py:205
 msgid "Select Category"
 msgstr ""
 
+#: InvenTree/forms.py:226
+msgid "E-mail (again)"
+msgstr ""
+
+#: InvenTree/forms.py:230
+msgid "E-mail address confirmation"
+msgstr ""
+
+#: InvenTree/forms.py:250
+msgid "You must type the same email each time."
+msgstr ""
+
 #: InvenTree/helpers.py:401
 #, python-brace-format
 msgid "Duplicate serial: {n}"
@@ -118,8 +131,8 @@ msgstr ""
 msgid "File comment"
 msgstr ""
 
-#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1011
-#: common/models.py:1012 part/models.py:2055
+#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1055
+#: common/models.py:1056 part/models.py:2055
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/translated/stock.js:1669
 msgid "User"
@@ -205,75 +218,75 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: InvenTree/settings.py:523
+#: InvenTree/settings.py:529
 msgid "German"
 msgstr ""
 
-#: InvenTree/settings.py:524
+#: InvenTree/settings.py:530
 msgid "Greek"
 msgstr ""
 
-#: InvenTree/settings.py:525
+#: InvenTree/settings.py:531
 msgid "English"
 msgstr ""
 
-#: InvenTree/settings.py:526
+#: InvenTree/settings.py:532
 msgid "Spanish"
 msgstr ""
 
-#: InvenTree/settings.py:527
+#: InvenTree/settings.py:533
 msgid "French"
 msgstr ""
 
-#: InvenTree/settings.py:528
+#: InvenTree/settings.py:534
 msgid "Hebrew"
 msgstr ""
 
-#: InvenTree/settings.py:529
+#: InvenTree/settings.py:535
 msgid "Italian"
 msgstr ""
 
-#: InvenTree/settings.py:530
+#: InvenTree/settings.py:536
 msgid "Japanese"
 msgstr ""
 
-#: InvenTree/settings.py:531
+#: InvenTree/settings.py:537
 msgid "Korean"
 msgstr ""
 
-#: InvenTree/settings.py:532
+#: InvenTree/settings.py:538
 msgid "Dutch"
 msgstr ""
 
-#: InvenTree/settings.py:533
+#: InvenTree/settings.py:539
 msgid "Norwegian"
 msgstr ""
 
-#: InvenTree/settings.py:534
+#: InvenTree/settings.py:540
 msgid "Polish"
 msgstr ""
 
-#: InvenTree/settings.py:535
+#: InvenTree/settings.py:541
 msgid "Russian"
 msgstr ""
 
-#: InvenTree/settings.py:536
+#: InvenTree/settings.py:542
 msgid "Swedish"
 msgstr ""
 
-#: InvenTree/settings.py:537
+#: InvenTree/settings.py:543
 msgid "Thai"
 msgstr ""
 
-#: InvenTree/settings.py:538
+#: InvenTree/settings.py:544
 msgid "Turkish"
 msgstr ""
 
-#: InvenTree/settings.py:539
+#: InvenTree/settings.py:545
 msgid "Vietnamese"
 msgstr ""
 
-#: InvenTree/settings.py:540
+#: InvenTree/settings.py:546
 msgid "Chinese"
 msgstr ""
 
@@ -458,27 +471,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:610
+#: InvenTree/views.py:616
 msgid "Delete Item"
 msgstr ""
 
-#: InvenTree/views.py:659
+#: InvenTree/views.py:665
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:674 templates/InvenTree/settings/user.html:14
+#: InvenTree/views.py:680 templates/InvenTree/settings/user.html:18
 msgid "Edit User Information"
 msgstr ""
 
-#: InvenTree/views.py:685 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:691 templates/InvenTree/settings/user.html:22
 msgid "Set Password"
 msgstr ""
 
-#: InvenTree/views.py:704
+#: InvenTree/views.py:710
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:910 templates/navbar.html:97
+#: InvenTree/views.py:954 templates/navbar.html:97
 msgid "System Information"
 msgstr ""
 
@@ -551,7 +564,7 @@ msgstr ""
 #: build/forms.py:48 build/forms.py:90 build/models.py:1281
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:1043
+#: build/templates/build/detail.html:34 common/models.py:1087
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:101 order/forms.py:123 order/models.py:720
 #: order/models.py:982 order/templates/order/order_wizard/match_parts.html:30
@@ -681,8 +694,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:50
 #: part/templates/part/navbar.html:53 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:171
-#: templates/InvenTree/settings/navbar.html:107
-#: templates/InvenTree/settings/navbar.html:109 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1541,7 +1554,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:308 common/models.py:843 common/models.py:1004
+#: common/models.py:308 common/models.py:887 common/models.py:1048
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1955,196 +1968,252 @@ msgstr ""
 msgid "Enable PO functionality in InvenTree interface"
 msgstr ""
 
+#: common/models.py:836
+msgid "Enable password forgot"
+msgstr ""
+
+#: common/models.py:837
+msgid "Enable password forgot function on the login-pages"
+msgstr ""
+
+#: common/models.py:842
+msgid "Enable registration"
+msgstr ""
+
+#: common/models.py:843
+msgid "Enable self-registration for users on the login-pages"
+msgstr ""
+
+#: common/models.py:848
+msgid "Enable SSO"
+msgstr ""
+
+#: common/models.py:849
+msgid "Enable SSO on the login-pages"
+msgstr ""
+
 #: common/models.py:854
-msgid "Show starred parts"
+msgid "E-Mail required"
 msgstr ""
 
 #: common/models.py:855
-msgid "Show starred parts on the homepage"
+msgid "Require user to supply mail on signup"
 msgstr ""
 
 #: common/models.py:860
-msgid "Show latest parts"
+msgid "Auto-fill SSO users"
 msgstr ""
 
 #: common/models.py:861
-msgid "Show latest parts on the homepage"
+msgid "Automatically fill out user-details from SSO account-data"
 msgstr ""
 
 #: common/models.py:866
-msgid "Recent Part Count"
+msgid "Mail twice"
 msgstr ""
 
 #: common/models.py:867
-msgid "Number of recent parts to display on index page"
+msgid "On signup ask users twice for their mail"
+msgstr ""
+
+#: common/models.py:872
+msgid "Password twice"
 msgstr ""
 
 #: common/models.py:873
-msgid "Show unvalidated BOMs"
-msgstr ""
-
-#: common/models.py:874
-msgid "Show BOMs that await validation on the homepage"
-msgstr ""
-
-#: common/models.py:879
-msgid "Show recent stock changes"
-msgstr ""
-
-#: common/models.py:880
-msgid "Show recently changed stock items on the homepage"
-msgstr ""
-
-#: common/models.py:885
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:886
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:891
-msgid "Show low stock"
-msgstr ""
-
-#: common/models.py:892
-msgid "Show low stock items on the homepage"
-msgstr ""
-
-#: common/models.py:897
-msgid "Show depleted stock"
+msgid "On signup ask users twice for their password"
 msgstr ""
 
 #: common/models.py:898
-msgid "Show depleted stock items on the homepage"
+msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:903
-msgid "Show needed stock"
+#: common/models.py:899
+msgid "Show starred parts on the homepage"
 msgstr ""
 
 #: common/models.py:904
-msgid "Show stock items needed for builds on the homepage"
+msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:909
-msgid "Show expired stock"
+#: common/models.py:905
+msgid "Show latest parts on the homepage"
 msgstr ""
 
 #: common/models.py:910
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:911
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:917
+msgid "Show unvalidated BOMs"
+msgstr ""
+
+#: common/models.py:918
+msgid "Show BOMs that await validation on the homepage"
+msgstr ""
+
+#: common/models.py:923
+msgid "Show recent stock changes"
+msgstr ""
+
+#: common/models.py:924
+msgid "Show recently changed stock items on the homepage"
+msgstr ""
+
+#: common/models.py:929
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:930
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:935
+msgid "Show low stock"
+msgstr ""
+
+#: common/models.py:936
+msgid "Show low stock items on the homepage"
+msgstr ""
+
+#: common/models.py:941
+msgid "Show depleted stock"
+msgstr ""
+
+#: common/models.py:942
+msgid "Show depleted stock items on the homepage"
+msgstr ""
+
+#: common/models.py:947
+msgid "Show needed stock"
+msgstr ""
+
+#: common/models.py:948
+msgid "Show stock items needed for builds on the homepage"
+msgstr ""
+
+#: common/models.py:953
+msgid "Show expired stock"
+msgstr ""
+
+#: common/models.py:954
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:915
+#: common/models.py:959
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:916
+#: common/models.py:960
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:921
+#: common/models.py:965
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:922
+#: common/models.py:966
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:927
+#: common/models.py:971
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:928
+#: common/models.py:972
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:933
+#: common/models.py:977
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:934
+#: common/models.py:978
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:939
+#: common/models.py:983
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:940
+#: common/models.py:984
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:945
+#: common/models.py:989
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:946
+#: common/models.py:990
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:951
+#: common/models.py:995
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:952
+#: common/models.py:996
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:958
+#: common/models.py:1002
 msgid "Inline label display"
 msgstr ""
 
-#: common/models.py:959
+#: common/models.py:1003
 msgid "Display PDF labels in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:965
+#: common/models.py:1009
 msgid "Inline report display"
 msgstr ""
 
-#: common/models.py:966
+#: common/models.py:1010
 msgid "Display PDF reports in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:972
+#: common/models.py:1016
 msgid "Search Preview Results"
 msgstr ""
 
-#: common/models.py:973
+#: common/models.py:1017
 msgid "Number of results to show in search preview window"
 msgstr ""
 
-#: common/models.py:979
+#: common/models.py:1023
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:980
+#: common/models.py:1024
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:986
+#: common/models.py:1030
 msgid "Escape Key Closes Forms"
 msgstr ""
 
-#: common/models.py:987
+#: common/models.py:1031
 msgid "Use the escape key to close modal forms"
 msgstr ""
 
-#: common/models.py:1044 company/forms.py:43
+#: common/models.py:1088 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:1051 company/templates/company/supplier_part.html:231
+#: common/models.py:1095 company/templates/company/supplier_part.html:231
 #: templates/js/translated/part.js:1369
 msgid "Price"
 msgstr ""
 
-#: common/models.py:1052
+#: common/models.py:1096
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1145
+#: common/models.py:1189
 msgid "Default"
 msgstr ""
 
@@ -2593,8 +2662,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:82
 #: part/templates/part/navbar.html:85 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:229
-#: templates/InvenTree/settings/navbar.html:113
-#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:119
+#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:44
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2617,8 +2686,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:91
 #: part/templates/part/navbar.html:94 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:249
-#: templates/InvenTree/settings/navbar.html:119
-#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:55
+#: templates/InvenTree/settings/navbar.html:125
+#: templates/InvenTree/settings/navbar.html:127 templates/navbar.html:55
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2704,7 +2773,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part.html:239
 #: part/templates/part/detail.html:214 part/templates/part/detail.html:294
 #: part/templates/part/detail.html:317 templates/js/translated/company.js:424
-#: templates/js/translated/helpers.js:31 users/models.py:194
+#: templates/js/translated/helpers.js:31 users/models.py:199
 msgid "Delete"
 msgstr ""
 
@@ -2753,8 +2822,8 @@ msgstr ""
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:182
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109
 #: templates/js/translated/part.js:540 templates/js/translated/part.js:769
 #: templates/js/translated/part.js:945 templates/js/translated/stock.js:182
 #: templates/js/translated/stock.js:829 templates/navbar.html:32
@@ -3712,8 +3781,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
 #: templates/js/translated/part.js:1165 templates/navbar.html:29
 #: templates/stats.html:80 templates/stats.html:89 users/models.py:41
 msgid "Parts"
@@ -3927,7 +3996,7 @@ msgstr ""
 
 #: part/models.py:696 part/models.py:2299
 #: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:168
+#: templates/InvenTree/settings/settings.html:169
 #: templates/js/translated/part.js:927
 msgid "Category"
 msgstr ""
@@ -4117,7 +4186,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2256 part/models.py:2305 part/models.py:2306
-#: templates/InvenTree/settings/settings.html:163
+#: templates/InvenTree/settings/settings.html:164
 msgid "Parameter Template"
 msgstr ""
 
@@ -4129,7 +4198,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2310 templates/InvenTree/settings/settings.html:172
+#: part/models.py:2310 templates/InvenTree/settings/settings.html:173
 msgid "Default Value"
 msgstr ""
 
@@ -6143,6 +6212,14 @@ msgstr ""
 msgid "Setting"
 msgstr ""
 
+#: templates/InvenTree/settings/login.html:9
+msgid "Login Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/login.html:22 templates/account/signup.html:5
+msgid "Signup"
+msgstr ""
+
 #: templates/InvenTree/settings/navbar.html:12
 #: templates/InvenTree/settings/user_settings.html:9
 msgid "User Settings"
@@ -6196,22 +6273,27 @@ msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
-msgid "Barcodes"
+#: templates/InvenTree/settings/navbar.html:73 templates/navbar.html:87
+msgid "Login"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:77
 #: templates/InvenTree/settings/navbar.html:79
-msgid "Currencies"
+msgid "Barcodes"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:83
 #: templates/InvenTree/settings/navbar.html:85
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
 msgid "Reporting"
 msgstr ""
 
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103
 msgid "Categories"
 msgstr ""
 
@@ -6252,21 +6334,21 @@ msgstr ""
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:153
+#: templates/InvenTree/settings/settings.html:154
 msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:175
-#: templates/InvenTree/settings/settings.html:274
-msgid "Edit Template"
-msgstr ""
-
 #: templates/InvenTree/settings/settings.html:176
 #: templates/InvenTree/settings/settings.html:275
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/settings.html:177
+#: templates/InvenTree/settings/settings.html:276
 msgid "Delete Template"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:254
+#: templates/InvenTree/settings/settings.html:255
 msgid "No part parameter templates found"
 msgstr ""
 
@@ -6278,70 +6360,136 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:9
+#: templates/InvenTree/settings/user.html:11
 msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:15
+#: templates/InvenTree/settings/user.html:19
 #: templates/js/translated/helpers.js:26
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:17
+#: templates/InvenTree/settings/user.html:21
+#: templates/account/password_reset_from_key.html:4
+#: templates/account/password_reset_from_key.html:7
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:24
-#: templates/registration/login.html:58
+#: templates/InvenTree/settings/user.html:28
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:32
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:36
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
-msgid "Email Address"
+#: templates/InvenTree/settings/user.html:42
+msgid "E-Mail"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:42
-msgid "Theme Settings"
+#: templates/InvenTree/settings/user.html:47
+msgid "The following e-mail addresses are associated with your account:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:61
+msgid "Verified"
 msgstr ""
 
 #: templates/InvenTree/settings/user.html:63
+msgid "Unverified"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:65
+msgid "Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:71
+msgid "Make Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:72
+msgid "Re-send Verification"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:73
+#: templates/InvenTree/settings/user.html:130
+msgid "Remove"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:80
+msgid "Warning:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:81
+msgid "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."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:88
+msgid "Add E-mail Address"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:93
+msgid "Add E-mail"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:100
+msgid "Social Accounts"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:105
+msgid "You can sign in to your account using any of the following third party accounts:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:138
+msgid "You currently have no social network accounts connected to this account."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:142
+msgid "Add a 3rd Party Account"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:153
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:174
 msgid "Set Theme"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:70
+#: templates/InvenTree/settings/user.html:181
 msgid "Language Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:89
+#: templates/InvenTree/settings/user.html:200
 #, python-format
 msgid "%(lang_translated)s%% translated"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:91
+#: templates/InvenTree/settings/user.html:202
 msgid "No translations available"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:98
+#: templates/InvenTree/settings/user.html:209
 msgid "Set Language"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:103
+#: templates/InvenTree/settings/user.html:214
 msgid "Help the translation efforts!"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:104
+#: templates/InvenTree/settings/user.html:215
 #, python-format
 msgid "Native language translation of the InvenTree web application is <a href=\"%(link)s\">community contributed via crowdin</a>. Contributions are welcomed and encouraged."
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:223
+msgid "Do you really want to remove the selected e-mail address?"
+msgstr ""
+
 #: templates/InvenTree/settings/user_forms.html:9
 msgid "Form Settings"
 msgstr ""
@@ -6433,6 +6581,105 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#: templates/account/email_confirm.html:6
+#: templates/account/email_confirm.html:10
+msgid "Confirm E-mail Address"
+msgstr ""
+
+#: templates/account/email_confirm.html:16
+#, python-format
+msgid "Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail address for user %(user_display)s."
+msgstr ""
+
+#: templates/account/email_confirm.html:27
+#, python-format
+msgid "This e-mail confirmation link expired or is invalid. Please <a href=\"%(email_url)s\">issue a new e-mail confirmation request</a>."
+msgstr ""
+
+#: templates/account/login.html:5 templates/account/login.html:14
+#: templates/account/login.html:36
+msgid "Sign In"
+msgstr ""
+
+#: templates/account/login.html:19
+#, python-format
+msgid ""
+"Please sign in with one\n"
+"of your existing third party accounts or  <a class=\"btn btn-primary btn-small\" href=\"%(signup_url)s\">sign up</a>\n"
+"for a account and sign in below:"
+msgstr ""
+
+#: templates/account/login.html:23
+#, python-format
+msgid ""
+"If you have not created an account yet, then please\n"
+"<a href=\"%(signup_url)s\">sign up</a> first."
+msgstr ""
+
+#: templates/account/login.html:38
+msgid "Forgot Password?"
+msgstr ""
+
+#: templates/account/login.html:45
+msgid "or use SSO"
+msgstr ""
+
+#: templates/account/logout.html:5 templates/account/logout.html:8
+#: templates/account/logout.html:17
+msgid "Sign Out"
+msgstr ""
+
+#: templates/account/logout.html:10
+msgid "Are you sure you want to sign out?"
+msgstr ""
+
+#: templates/account/password_reset.html:5
+#: templates/account/password_reset.html:12
+msgid "Password Reset"
+msgstr ""
+
+#: templates/account/password_reset.html:18
+msgid "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it."
+msgstr ""
+
+#: templates/account/password_reset.html:23
+msgid "Reset My Password"
+msgstr ""
+
+#: templates/account/password_reset.html:27 templates/account/signup.html:36
+msgid "This function is currently disabled. Please contact an administrator."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:7
+msgid "Bad Token"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:11
+#, python-format
+msgid "The password reset link was invalid, possibly because it has already been used.  Please request a <a href=\"%(passwd_reset_url)s\">new password reset</a>."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:17
+msgid "change password"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:20
+msgid "Your password is now changed."
+msgstr ""
+
+#: templates/account/signup.html:11 templates/account/signup.html:22
+msgid "Sign Up"
+msgstr ""
+
+#: templates/account/signup.html:13
+#, python-format
+msgid "Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>."
+msgstr ""
+
+#: templates/account/signup.html:27
+msgid "Or use a SSO-provider for signup"
+msgstr ""
+
 #: templates/image_download.html:8
 msgid "Specify URL for downloading image"
 msgstr ""
@@ -7566,7 +7813,7 @@ msgstr ""
 msgid "Add Stock"
 msgstr ""
 
-#: templates/js/translated/stock.js:165 users/models.py:190
+#: templates/js/translated/stock.js:165 users/models.py:195
 msgid "Add"
 msgstr ""
 
@@ -8023,10 +8270,6 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: templates/navbar.html:87 templates/registration/login.html:89
-msgid "Login"
-msgstr ""
-
 #: templates/navbar.html:106
 msgid "About InvenTree"
 msgstr ""
@@ -8035,68 +8278,12 @@ msgstr ""
 msgid "QR data not provided"
 msgstr ""
 
-#: templates/registration/logged_out.html:50
-msgid "You have been logged out"
+#: templates/registration/logged_out.html:6
+msgid "You were logged out successfully."
 msgstr ""
 
-#: templates/registration/logged_out.html:51
-#: templates/registration/password_reset_complete.html:51
-#: templates/registration/password_reset_done.html:58
-msgid "Return to login screen"
-msgstr ""
-
-#: templates/registration/login.html:64
-msgid "Enter username"
-msgstr ""
-
-#: templates/registration/login.html:70
-msgid "Password"
-msgstr ""
-
-#: templates/registration/login.html:83
-msgid "Username / password combination is incorrect"
-msgstr ""
-
-#: templates/registration/login.html:95
-#: templates/registration/password_reset_form.html:51
-msgid "Forgotten your password?"
-msgstr ""
-
-#: templates/registration/login.html:95
-msgid "Click here to reset"
-msgstr ""
-
-#: templates/registration/password_reset_complete.html:50
-msgid "Password reset complete"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:52
-#: templates/registration/password_reset_confirm.html:56
-msgid "Change password"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:60
-msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:51
-msgid "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:54
-msgid "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:52
-msgid "Enter your email address below."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:53
-msgid "An email will be sent with password reset instructions."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:58
-msgid "Send email"
+#: templates/registration/logged_out.html:8
+msgid "Log in again"
 msgstr ""
 
 #: templates/stats.html:13
@@ -8235,34 +8422,34 @@ msgstr ""
 msgid "Important dates"
 msgstr ""
 
-#: users/models.py:177
+#: users/models.py:182
 msgid "Permission set"
 msgstr ""
 
-#: users/models.py:185
+#: users/models.py:190
 msgid "Group"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "View"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "Permission to view items"
 msgstr ""
 
-#: users/models.py:190
+#: users/models.py:195
 msgid "Permission to add items"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Change"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Permissions to edit items"
 msgstr ""
 
-#: users/models.py:194
+#: users/models.py:199
 msgid "Permission to delete items"
 msgstr ""
diff --git a/InvenTree/locale/en/LC_MESSAGES/django.po b/InvenTree/locale/en/LC_MESSAGES/django.po
index 03db9252e7..3e4d07b888 100644
--- a/InvenTree/locale/en/LC_MESSAGES/django.po
+++ b/InvenTree/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-11 01:01+0000\n"
+"POT-Creation-Date: 2021-10-11 06:21+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,41 +34,54 @@ msgstr ""
 msgid "Enter date"
 msgstr ""
 
-#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:116 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:173 build/forms.py:215 order/forms.py:27
 #: order/forms.py:38 order/forms.py:49 order/forms.py:60 order/forms.py:71
-#: part/forms.py:108 templates/js/translated/forms.js:564
+#: part/forms.py:108 templates/account/email_confirm.html:20
+#: templates/js/translated/forms.js:564
 msgid "Confirm"
 msgstr ""
 
-#: InvenTree/forms.py:127
+#: InvenTree/forms.py:132
 msgid "Confirm delete"
 msgstr ""
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:133
 msgid "Confirm item deletion"
 msgstr ""
 
-#: InvenTree/forms.py:160 templates/registration/login.html:76
+#: InvenTree/forms.py:164
 msgid "Enter password"
 msgstr ""
 
-#: InvenTree/forms.py:161
+#: InvenTree/forms.py:165
 msgid "Enter new password"
 msgstr ""
 
-#: InvenTree/forms.py:168
+#: InvenTree/forms.py:172
 msgid "Confirm password"
 msgstr ""
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:173
 msgid "Confirm new password"
 msgstr ""
 
-#: InvenTree/forms.py:201
+#: InvenTree/forms.py:205
 msgid "Select Category"
 msgstr ""
 
+#: InvenTree/forms.py:226
+msgid "E-mail (again)"
+msgstr ""
+
+#: InvenTree/forms.py:230
+msgid "E-mail address confirmation"
+msgstr ""
+
+#: InvenTree/forms.py:250
+msgid "You must type the same email each time."
+msgstr ""
+
 #: InvenTree/helpers.py:401
 #, python-brace-format
 msgid "Duplicate serial: {n}"
@@ -119,8 +132,8 @@ msgstr ""
 msgid "File comment"
 msgstr ""
 
-#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1011
-#: common/models.py:1012 part/models.py:2055
+#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1055
+#: common/models.py:1056 part/models.py:2055
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/translated/stock.js:1669
 msgid "User"
@@ -206,75 +219,75 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: InvenTree/settings.py:523
+#: InvenTree/settings.py:529
 msgid "German"
 msgstr ""
 
-#: InvenTree/settings.py:524
+#: InvenTree/settings.py:530
 msgid "Greek"
 msgstr ""
 
-#: InvenTree/settings.py:525
+#: InvenTree/settings.py:531
 msgid "English"
 msgstr ""
 
-#: InvenTree/settings.py:526
+#: InvenTree/settings.py:532
 msgid "Spanish"
 msgstr ""
 
-#: InvenTree/settings.py:527
+#: InvenTree/settings.py:533
 msgid "French"
 msgstr ""
 
-#: InvenTree/settings.py:528
+#: InvenTree/settings.py:534
 msgid "Hebrew"
 msgstr ""
 
-#: InvenTree/settings.py:529
+#: InvenTree/settings.py:535
 msgid "Italian"
 msgstr ""
 
-#: InvenTree/settings.py:530
+#: InvenTree/settings.py:536
 msgid "Japanese"
 msgstr ""
 
-#: InvenTree/settings.py:531
+#: InvenTree/settings.py:537
 msgid "Korean"
 msgstr ""
 
-#: InvenTree/settings.py:532
+#: InvenTree/settings.py:538
 msgid "Dutch"
 msgstr ""
 
-#: InvenTree/settings.py:533
+#: InvenTree/settings.py:539
 msgid "Norwegian"
 msgstr ""
 
-#: InvenTree/settings.py:534
+#: InvenTree/settings.py:540
 msgid "Polish"
 msgstr ""
 
-#: InvenTree/settings.py:535
+#: InvenTree/settings.py:541
 msgid "Russian"
 msgstr ""
 
-#: InvenTree/settings.py:536
+#: InvenTree/settings.py:542
 msgid "Swedish"
 msgstr ""
 
-#: InvenTree/settings.py:537
+#: InvenTree/settings.py:543
 msgid "Thai"
 msgstr ""
 
-#: InvenTree/settings.py:538
+#: InvenTree/settings.py:544
 msgid "Turkish"
 msgstr ""
 
-#: InvenTree/settings.py:539
+#: InvenTree/settings.py:545
 msgid "Vietnamese"
 msgstr ""
 
-#: InvenTree/settings.py:540
+#: InvenTree/settings.py:546
 msgid "Chinese"
 msgstr ""
 
@@ -459,27 +472,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:610
+#: InvenTree/views.py:616
 msgid "Delete Item"
 msgstr ""
 
-#: InvenTree/views.py:659
+#: InvenTree/views.py:665
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:674 templates/InvenTree/settings/user.html:14
+#: InvenTree/views.py:680 templates/InvenTree/settings/user.html:18
 msgid "Edit User Information"
 msgstr ""
 
-#: InvenTree/views.py:685 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:691 templates/InvenTree/settings/user.html:22
 msgid "Set Password"
 msgstr ""
 
-#: InvenTree/views.py:704
+#: InvenTree/views.py:710
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:910 templates/navbar.html:97
+#: InvenTree/views.py:954 templates/navbar.html:97
 msgid "System Information"
 msgstr ""
 
@@ -552,7 +565,7 @@ msgstr ""
 #: build/forms.py:48 build/forms.py:90 build/models.py:1281
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:1043
+#: build/templates/build/detail.html:34 common/models.py:1087
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:101 order/forms.py:123 order/models.py:720
 #: order/models.py:982 order/templates/order/order_wizard/match_parts.html:30
@@ -682,8 +695,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:50
 #: part/templates/part/navbar.html:53 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:171
-#: templates/InvenTree/settings/navbar.html:107
-#: templates/InvenTree/settings/navbar.html:109 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1542,7 +1555,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:308 common/models.py:843 common/models.py:1004
+#: common/models.py:308 common/models.py:887 common/models.py:1048
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1956,196 +1969,252 @@ msgstr ""
 msgid "Enable PO functionality in InvenTree interface"
 msgstr ""
 
+#: common/models.py:836
+msgid "Enable password forgot"
+msgstr ""
+
+#: common/models.py:837
+msgid "Enable password forgot function on the login-pages"
+msgstr ""
+
+#: common/models.py:842
+msgid "Enable registration"
+msgstr ""
+
+#: common/models.py:843
+msgid "Enable self-registration for users on the login-pages"
+msgstr ""
+
+#: common/models.py:848
+msgid "Enable SSO"
+msgstr ""
+
+#: common/models.py:849
+msgid "Enable SSO on the login-pages"
+msgstr ""
+
 #: common/models.py:854
-msgid "Show starred parts"
+msgid "E-Mail required"
 msgstr ""
 
 #: common/models.py:855
-msgid "Show starred parts on the homepage"
+msgid "Require user to supply mail on signup"
 msgstr ""
 
 #: common/models.py:860
-msgid "Show latest parts"
+msgid "Auto-fill SSO users"
 msgstr ""
 
 #: common/models.py:861
-msgid "Show latest parts on the homepage"
+msgid "Automatically fill out user-details from SSO account-data"
 msgstr ""
 
 #: common/models.py:866
-msgid "Recent Part Count"
+msgid "Mail twice"
 msgstr ""
 
 #: common/models.py:867
-msgid "Number of recent parts to display on index page"
+msgid "On signup ask users twice for their mail"
+msgstr ""
+
+#: common/models.py:872
+msgid "Password twice"
 msgstr ""
 
 #: common/models.py:873
-msgid "Show unvalidated BOMs"
-msgstr ""
-
-#: common/models.py:874
-msgid "Show BOMs that await validation on the homepage"
-msgstr ""
-
-#: common/models.py:879
-msgid "Show recent stock changes"
-msgstr ""
-
-#: common/models.py:880
-msgid "Show recently changed stock items on the homepage"
-msgstr ""
-
-#: common/models.py:885
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:886
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:891
-msgid "Show low stock"
-msgstr ""
-
-#: common/models.py:892
-msgid "Show low stock items on the homepage"
-msgstr ""
-
-#: common/models.py:897
-msgid "Show depleted stock"
+msgid "On signup ask users twice for their password"
 msgstr ""
 
 #: common/models.py:898
-msgid "Show depleted stock items on the homepage"
+msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:903
-msgid "Show needed stock"
+#: common/models.py:899
+msgid "Show starred parts on the homepage"
 msgstr ""
 
 #: common/models.py:904
-msgid "Show stock items needed for builds on the homepage"
+msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:909
-msgid "Show expired stock"
+#: common/models.py:905
+msgid "Show latest parts on the homepage"
 msgstr ""
 
 #: common/models.py:910
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:911
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:917
+msgid "Show unvalidated BOMs"
+msgstr ""
+
+#: common/models.py:918
+msgid "Show BOMs that await validation on the homepage"
+msgstr ""
+
+#: common/models.py:923
+msgid "Show recent stock changes"
+msgstr ""
+
+#: common/models.py:924
+msgid "Show recently changed stock items on the homepage"
+msgstr ""
+
+#: common/models.py:929
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:930
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:935
+msgid "Show low stock"
+msgstr ""
+
+#: common/models.py:936
+msgid "Show low stock items on the homepage"
+msgstr ""
+
+#: common/models.py:941
+msgid "Show depleted stock"
+msgstr ""
+
+#: common/models.py:942
+msgid "Show depleted stock items on the homepage"
+msgstr ""
+
+#: common/models.py:947
+msgid "Show needed stock"
+msgstr ""
+
+#: common/models.py:948
+msgid "Show stock items needed for builds on the homepage"
+msgstr ""
+
+#: common/models.py:953
+msgid "Show expired stock"
+msgstr ""
+
+#: common/models.py:954
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:915
+#: common/models.py:959
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:916
+#: common/models.py:960
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:921
+#: common/models.py:965
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:922
+#: common/models.py:966
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:927
+#: common/models.py:971
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:928
+#: common/models.py:972
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:933
+#: common/models.py:977
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:934
+#: common/models.py:978
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:939
+#: common/models.py:983
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:940
+#: common/models.py:984
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:945
+#: common/models.py:989
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:946
+#: common/models.py:990
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:951
+#: common/models.py:995
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:952
+#: common/models.py:996
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:958
+#: common/models.py:1002
 msgid "Inline label display"
 msgstr ""
 
-#: common/models.py:959
+#: common/models.py:1003
 msgid "Display PDF labels in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:965
+#: common/models.py:1009
 msgid "Inline report display"
 msgstr ""
 
-#: common/models.py:966
+#: common/models.py:1010
 msgid "Display PDF reports in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:972
+#: common/models.py:1016
 msgid "Search Preview Results"
 msgstr ""
 
-#: common/models.py:973
+#: common/models.py:1017
 msgid "Number of results to show in search preview window"
 msgstr ""
 
-#: common/models.py:979
+#: common/models.py:1023
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:980
+#: common/models.py:1024
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:986
+#: common/models.py:1030
 msgid "Escape Key Closes Forms"
 msgstr ""
 
-#: common/models.py:987
+#: common/models.py:1031
 msgid "Use the escape key to close modal forms"
 msgstr ""
 
-#: common/models.py:1044 company/forms.py:43
+#: common/models.py:1088 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:1051 company/templates/company/supplier_part.html:231
+#: common/models.py:1095 company/templates/company/supplier_part.html:231
 #: templates/js/translated/part.js:1369
 msgid "Price"
 msgstr ""
 
-#: common/models.py:1052
+#: common/models.py:1096
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1145
+#: common/models.py:1189
 msgid "Default"
 msgstr ""
 
@@ -2594,8 +2663,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:82
 #: part/templates/part/navbar.html:85 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:229
-#: templates/InvenTree/settings/navbar.html:113
-#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:119
+#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:44
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2618,8 +2687,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:91
 #: part/templates/part/navbar.html:94 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:249
-#: templates/InvenTree/settings/navbar.html:119
-#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:55
+#: templates/InvenTree/settings/navbar.html:125
+#: templates/InvenTree/settings/navbar.html:127 templates/navbar.html:55
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2705,7 +2774,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part.html:239
 #: part/templates/part/detail.html:214 part/templates/part/detail.html:294
 #: part/templates/part/detail.html:317 templates/js/translated/company.js:424
-#: templates/js/translated/helpers.js:31 users/models.py:194
+#: templates/js/translated/helpers.js:31 users/models.py:199
 msgid "Delete"
 msgstr ""
 
@@ -2754,8 +2823,8 @@ msgstr ""
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:182
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109
 #: templates/js/translated/part.js:540 templates/js/translated/part.js:769
 #: templates/js/translated/part.js:945 templates/js/translated/stock.js:182
 #: templates/js/translated/stock.js:829 templates/navbar.html:32
@@ -3713,8 +3782,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
 #: templates/js/translated/part.js:1165 templates/navbar.html:29
 #: templates/stats.html:80 templates/stats.html:89 users/models.py:41
 msgid "Parts"
@@ -3928,7 +3997,7 @@ msgstr ""
 
 #: part/models.py:696 part/models.py:2299
 #: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:168
+#: templates/InvenTree/settings/settings.html:169
 #: templates/js/translated/part.js:927
 msgid "Category"
 msgstr ""
@@ -4118,7 +4187,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2256 part/models.py:2305 part/models.py:2306
-#: templates/InvenTree/settings/settings.html:163
+#: templates/InvenTree/settings/settings.html:164
 msgid "Parameter Template"
 msgstr ""
 
@@ -4130,7 +4199,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2310 templates/InvenTree/settings/settings.html:172
+#: part/models.py:2310 templates/InvenTree/settings/settings.html:173
 msgid "Default Value"
 msgstr ""
 
@@ -6144,6 +6213,14 @@ msgstr ""
 msgid "Setting"
 msgstr ""
 
+#: templates/InvenTree/settings/login.html:9
+msgid "Login Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/login.html:22 templates/account/signup.html:5
+msgid "Signup"
+msgstr ""
+
 #: templates/InvenTree/settings/navbar.html:12
 #: templates/InvenTree/settings/user_settings.html:9
 msgid "User Settings"
@@ -6197,22 +6274,27 @@ msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
-msgid "Barcodes"
+#: templates/InvenTree/settings/navbar.html:73 templates/navbar.html:87
+msgid "Login"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:77
 #: templates/InvenTree/settings/navbar.html:79
-msgid "Currencies"
+msgid "Barcodes"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:83
 #: templates/InvenTree/settings/navbar.html:85
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
 msgid "Reporting"
 msgstr ""
 
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103
 msgid "Categories"
 msgstr ""
 
@@ -6253,21 +6335,21 @@ msgstr ""
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:153
+#: templates/InvenTree/settings/settings.html:154
 msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:175
-#: templates/InvenTree/settings/settings.html:274
-msgid "Edit Template"
-msgstr ""
-
 #: templates/InvenTree/settings/settings.html:176
 #: templates/InvenTree/settings/settings.html:275
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/settings.html:177
+#: templates/InvenTree/settings/settings.html:276
 msgid "Delete Template"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:254
+#: templates/InvenTree/settings/settings.html:255
 msgid "No part parameter templates found"
 msgstr ""
 
@@ -6279,70 +6361,136 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:9
+#: templates/InvenTree/settings/user.html:11
 msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:15
+#: templates/InvenTree/settings/user.html:19
 #: templates/js/translated/helpers.js:26
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:17
+#: templates/InvenTree/settings/user.html:21
+#: templates/account/password_reset_from_key.html:4
+#: templates/account/password_reset_from_key.html:7
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:24
-#: templates/registration/login.html:58
+#: templates/InvenTree/settings/user.html:28
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:32
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:36
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
-msgid "Email Address"
+#: templates/InvenTree/settings/user.html:42
+msgid "E-Mail"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:42
-msgid "Theme Settings"
+#: templates/InvenTree/settings/user.html:47
+msgid "The following e-mail addresses are associated with your account:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:61
+msgid "Verified"
 msgstr ""
 
 #: templates/InvenTree/settings/user.html:63
+msgid "Unverified"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:65
+msgid "Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:71
+msgid "Make Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:72
+msgid "Re-send Verification"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:73
+#: templates/InvenTree/settings/user.html:130
+msgid "Remove"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:80
+msgid "Warning:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:81
+msgid "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."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:88
+msgid "Add E-mail Address"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:93
+msgid "Add E-mail"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:100
+msgid "Social Accounts"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:105
+msgid "You can sign in to your account using any of the following third party accounts:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:138
+msgid "You currently have no social network accounts connected to this account."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:142
+msgid "Add a 3rd Party Account"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:153
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:174
 msgid "Set Theme"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:70
+#: templates/InvenTree/settings/user.html:181
 msgid "Language Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:89
+#: templates/InvenTree/settings/user.html:200
 #, python-format
 msgid "%(lang_translated)s%% translated"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:91
+#: templates/InvenTree/settings/user.html:202
 msgid "No translations available"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:98
+#: templates/InvenTree/settings/user.html:209
 msgid "Set Language"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:103
+#: templates/InvenTree/settings/user.html:214
 msgid "Help the translation efforts!"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:104
+#: templates/InvenTree/settings/user.html:215
 #, python-format
 msgid "Native language translation of the InvenTree web application is <a href=\"%(link)s\">community contributed via crowdin</a>. Contributions are welcomed and encouraged."
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:223
+msgid "Do you really want to remove the selected e-mail address?"
+msgstr ""
+
 #: templates/InvenTree/settings/user_forms.html:9
 msgid "Form Settings"
 msgstr ""
@@ -6434,6 +6582,105 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#: templates/account/email_confirm.html:6
+#: templates/account/email_confirm.html:10
+msgid "Confirm E-mail Address"
+msgstr ""
+
+#: templates/account/email_confirm.html:16
+#, python-format
+msgid "Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail address for user %(user_display)s."
+msgstr ""
+
+#: templates/account/email_confirm.html:27
+#, python-format
+msgid "This e-mail confirmation link expired or is invalid. Please <a href=\"%(email_url)s\">issue a new e-mail confirmation request</a>."
+msgstr ""
+
+#: templates/account/login.html:5 templates/account/login.html:14
+#: templates/account/login.html:36
+msgid "Sign In"
+msgstr ""
+
+#: templates/account/login.html:19
+#, python-format
+msgid ""
+"Please sign in with one\n"
+"of your existing third party accounts or  <a class=\"btn btn-primary btn-small\" href=\"%(signup_url)s\">sign up</a>\n"
+"for a account and sign in below:"
+msgstr ""
+
+#: templates/account/login.html:23
+#, python-format
+msgid ""
+"If you have not created an account yet, then please\n"
+"<a href=\"%(signup_url)s\">sign up</a> first."
+msgstr ""
+
+#: templates/account/login.html:38
+msgid "Forgot Password?"
+msgstr ""
+
+#: templates/account/login.html:45
+msgid "or use SSO"
+msgstr ""
+
+#: templates/account/logout.html:5 templates/account/logout.html:8
+#: templates/account/logout.html:17
+msgid "Sign Out"
+msgstr ""
+
+#: templates/account/logout.html:10
+msgid "Are you sure you want to sign out?"
+msgstr ""
+
+#: templates/account/password_reset.html:5
+#: templates/account/password_reset.html:12
+msgid "Password Reset"
+msgstr ""
+
+#: templates/account/password_reset.html:18
+msgid "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it."
+msgstr ""
+
+#: templates/account/password_reset.html:23
+msgid "Reset My Password"
+msgstr ""
+
+#: templates/account/password_reset.html:27 templates/account/signup.html:36
+msgid "This function is currently disabled. Please contact an administrator."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:7
+msgid "Bad Token"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:11
+#, python-format
+msgid "The password reset link was invalid, possibly because it has already been used.  Please request a <a href=\"%(passwd_reset_url)s\">new password reset</a>."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:17
+msgid "change password"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:20
+msgid "Your password is now changed."
+msgstr ""
+
+#: templates/account/signup.html:11 templates/account/signup.html:22
+msgid "Sign Up"
+msgstr ""
+
+#: templates/account/signup.html:13
+#, python-format
+msgid "Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>."
+msgstr ""
+
+#: templates/account/signup.html:27
+msgid "Or use a SSO-provider for signup"
+msgstr ""
+
 #: templates/image_download.html:8
 msgid "Specify URL for downloading image"
 msgstr ""
@@ -7567,7 +7814,7 @@ msgstr ""
 msgid "Add Stock"
 msgstr ""
 
-#: templates/js/translated/stock.js:165 users/models.py:190
+#: templates/js/translated/stock.js:165 users/models.py:195
 msgid "Add"
 msgstr ""
 
@@ -8024,10 +8271,6 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: templates/navbar.html:87 templates/registration/login.html:89
-msgid "Login"
-msgstr ""
-
 #: templates/navbar.html:106
 msgid "About InvenTree"
 msgstr ""
@@ -8036,68 +8279,12 @@ msgstr ""
 msgid "QR data not provided"
 msgstr ""
 
-#: templates/registration/logged_out.html:50
-msgid "You have been logged out"
+#: templates/registration/logged_out.html:6
+msgid "You were logged out successfully."
 msgstr ""
 
-#: templates/registration/logged_out.html:51
-#: templates/registration/password_reset_complete.html:51
-#: templates/registration/password_reset_done.html:58
-msgid "Return to login screen"
-msgstr ""
-
-#: templates/registration/login.html:64
-msgid "Enter username"
-msgstr ""
-
-#: templates/registration/login.html:70
-msgid "Password"
-msgstr ""
-
-#: templates/registration/login.html:83
-msgid "Username / password combination is incorrect"
-msgstr ""
-
-#: templates/registration/login.html:95
-#: templates/registration/password_reset_form.html:51
-msgid "Forgotten your password?"
-msgstr ""
-
-#: templates/registration/login.html:95
-msgid "Click here to reset"
-msgstr ""
-
-#: templates/registration/password_reset_complete.html:50
-msgid "Password reset complete"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:52
-#: templates/registration/password_reset_confirm.html:56
-msgid "Change password"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:60
-msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:51
-msgid "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:54
-msgid "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:52
-msgid "Enter your email address below."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:53
-msgid "An email will be sent with password reset instructions."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:58
-msgid "Send email"
+#: templates/registration/logged_out.html:8
+msgid "Log in again"
 msgstr ""
 
 #: templates/stats.html:13
@@ -8236,34 +8423,34 @@ msgstr ""
 msgid "Important dates"
 msgstr ""
 
-#: users/models.py:177
+#: users/models.py:182
 msgid "Permission set"
 msgstr ""
 
-#: users/models.py:185
+#: users/models.py:190
 msgid "Group"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "View"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "Permission to view items"
 msgstr ""
 
-#: users/models.py:190
+#: users/models.py:195
 msgid "Permission to add items"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Change"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Permissions to edit items"
 msgstr ""
 
-#: users/models.py:194
+#: users/models.py:199
 msgid "Permission to delete items"
 msgstr ""
diff --git a/InvenTree/locale/es/LC_MESSAGES/django.po b/InvenTree/locale/es/LC_MESSAGES/django.po
index 9f527abb56..d991637b58 100644
--- a/InvenTree/locale/es/LC_MESSAGES/django.po
+++ b/InvenTree/locale/es/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-11 01:01+0000\n"
+"POT-Creation-Date: 2021-10-11 06:21+0000\n"
 "PO-Revision-Date: 2021-09-12 13:44\n"
 "Last-Translator: \n"
 "Language-Team: Spanish\n"
@@ -33,41 +33,54 @@ msgstr "No se encontró ninguna acción coincidente"
 msgid "Enter date"
 msgstr "Ingrese la fecha"
 
-#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:116 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:173 build/forms.py:215 order/forms.py:27
 #: order/forms.py:38 order/forms.py:49 order/forms.py:60 order/forms.py:71
-#: part/forms.py:108 templates/js/translated/forms.js:564
+#: part/forms.py:108 templates/account/email_confirm.html:20
+#: templates/js/translated/forms.js:564
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: InvenTree/forms.py:127
+#: InvenTree/forms.py:132
 msgid "Confirm delete"
 msgstr "Confirmar eliminación"
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:133
 msgid "Confirm item deletion"
 msgstr "Confirmar borrado de artículo"
 
-#: InvenTree/forms.py:160 templates/registration/login.html:76
+#: InvenTree/forms.py:164
 msgid "Enter password"
 msgstr "Introduzca contraseña"
 
-#: InvenTree/forms.py:161
+#: InvenTree/forms.py:165
 msgid "Enter new password"
 msgstr "Ingrese su nueva contraseña"
 
-#: InvenTree/forms.py:168
+#: InvenTree/forms.py:172
 msgid "Confirm password"
 msgstr "Confirmar la contraseña"
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:173
 msgid "Confirm new password"
 msgstr "Confirmar contraseña nueva"
 
-#: InvenTree/forms.py:201
+#: InvenTree/forms.py:205
 msgid "Select Category"
 msgstr "Seleccionar Categoría"
 
+#: InvenTree/forms.py:226
+msgid "E-mail (again)"
+msgstr ""
+
+#: InvenTree/forms.py:230
+msgid "E-mail address confirmation"
+msgstr ""
+
+#: InvenTree/forms.py:250
+msgid "You must type the same email each time."
+msgstr ""
+
 #: InvenTree/helpers.py:401
 #, python-brace-format
 msgid "Duplicate serial: {n}"
@@ -118,8 +131,8 @@ msgstr "Comentario"
 msgid "File comment"
 msgstr "Comentario del archivo"
 
-#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1011
-#: common/models.py:1012 part/models.py:2055
+#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1055
+#: common/models.py:1056 part/models.py:2055
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/translated/stock.js:1669
 msgid "User"
@@ -205,75 +218,75 @@ msgstr "Debe ser un numero valido"
 msgid "Filename"
 msgstr "Nombre de Archivo"
 
-#: InvenTree/settings.py:523
+#: InvenTree/settings.py:529
 msgid "German"
 msgstr "Alemán"
 
-#: InvenTree/settings.py:524
+#: InvenTree/settings.py:530
 msgid "Greek"
 msgstr "Griego"
 
-#: InvenTree/settings.py:525
+#: InvenTree/settings.py:531
 msgid "English"
 msgstr "Inglés"
 
-#: InvenTree/settings.py:526
+#: InvenTree/settings.py:532
 msgid "Spanish"
 msgstr "Español"
 
-#: InvenTree/settings.py:527
+#: InvenTree/settings.py:533
 msgid "French"
 msgstr "Francés"
 
-#: InvenTree/settings.py:528
+#: InvenTree/settings.py:534
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: InvenTree/settings.py:529
+#: InvenTree/settings.py:535
 msgid "Italian"
 msgstr "Italiano"
 
-#: InvenTree/settings.py:530
+#: InvenTree/settings.py:536
 msgid "Japanese"
 msgstr "Japonés"
 
-#: InvenTree/settings.py:531
+#: InvenTree/settings.py:537
 msgid "Korean"
 msgstr "Coreano"
 
-#: InvenTree/settings.py:532
+#: InvenTree/settings.py:538
 msgid "Dutch"
 msgstr "Holandés"
 
-#: InvenTree/settings.py:533
+#: InvenTree/settings.py:539
 msgid "Norwegian"
 msgstr "Noruego"
 
-#: InvenTree/settings.py:534
+#: InvenTree/settings.py:540
 msgid "Polish"
 msgstr "Polaco"
 
-#: InvenTree/settings.py:535
+#: InvenTree/settings.py:541
 msgid "Russian"
 msgstr "Ruso"
 
-#: InvenTree/settings.py:536
+#: InvenTree/settings.py:542
 msgid "Swedish"
 msgstr "Sueco"
 
-#: InvenTree/settings.py:537
+#: InvenTree/settings.py:543
 msgid "Thai"
 msgstr "Tailandés"
 
-#: InvenTree/settings.py:538
+#: InvenTree/settings.py:544
 msgid "Turkish"
 msgstr "Turco"
 
-#: InvenTree/settings.py:539
+#: InvenTree/settings.py:545
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: InvenTree/settings.py:540
+#: InvenTree/settings.py:546
 msgid "Chinese"
 msgstr "Chino"
 
@@ -458,27 +471,27 @@ msgstr "El excedente no debe superar el 100%"
 msgid "Overage must be an integer value or a percentage"
 msgstr "El excedente debe ser un valor entero o un porcentaje"
 
-#: InvenTree/views.py:610
+#: InvenTree/views.py:616
 msgid "Delete Item"
 msgstr "Eliminar elemento"
 
-#: InvenTree/views.py:659
+#: InvenTree/views.py:665
 msgid "Check box to confirm item deletion"
 msgstr "Marque la casilla para confirmar la eliminación del artículo"
 
-#: InvenTree/views.py:674 templates/InvenTree/settings/user.html:14
+#: InvenTree/views.py:680 templates/InvenTree/settings/user.html:18
 msgid "Edit User Information"
 msgstr "Editar datos del usuario"
 
-#: InvenTree/views.py:685 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:691 templates/InvenTree/settings/user.html:22
 msgid "Set Password"
 msgstr "Configurar Contraseña"
 
-#: InvenTree/views.py:704
+#: InvenTree/views.py:710
 msgid "Password fields must match"
 msgstr "Los campos de contraseña deben coincidir"
 
-#: InvenTree/views.py:910 templates/navbar.html:97
+#: InvenTree/views.py:954 templates/navbar.html:97
 msgid "System Information"
 msgstr "Información del sistema"
 
@@ -551,7 +564,7 @@ msgstr "Fecha límite para la finalización de la construcción. La construcció
 #: build/forms.py:48 build/forms.py:90 build/models.py:1281
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:1043
+#: build/templates/build/detail.html:34 common/models.py:1087
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:101 order/forms.py:123 order/models.py:720
 #: order/models.py:982 order/templates/order/order_wizard/match_parts.html:30
@@ -681,8 +694,8 @@ msgstr "Construir órden"
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:50
 #: part/templates/part/navbar.html:53 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:171
-#: templates/InvenTree/settings/navbar.html:107
-#: templates/InvenTree/settings/navbar.html:109 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 users/models.py:44
 msgid "Build Orders"
 msgstr "Construir órdenes"
 
@@ -1549,7 +1562,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:308 common/models.py:843 common/models.py:1004
+#: common/models.py:308 common/models.py:887 common/models.py:1048
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1963,196 +1976,256 @@ msgstr ""
 msgid "Enable PO functionality in InvenTree interface"
 msgstr ""
 
+#: common/models.py:836
+#, fuzzy
+#| msgid "Enter password"
+msgid "Enable password forgot"
+msgstr "Introduzca contraseña"
+
+#: common/models.py:837
+msgid "Enable password forgot function on the login-pages"
+msgstr ""
+
+#: common/models.py:842
+msgid "Enable registration"
+msgstr ""
+
+#: common/models.py:843
+msgid "Enable self-registration for users on the login-pages"
+msgstr ""
+
+#: common/models.py:848
+msgid "Enable SSO"
+msgstr ""
+
+#: common/models.py:849
+msgid "Enable SSO on the login-pages"
+msgstr ""
+
 #: common/models.py:854
-msgid "Show starred parts"
+msgid "E-Mail required"
 msgstr ""
 
 #: common/models.py:855
-msgid "Show starred parts on the homepage"
+msgid "Require user to supply mail on signup"
 msgstr ""
 
 #: common/models.py:860
-msgid "Show latest parts"
+msgid "Auto-fill SSO users"
 msgstr ""
 
 #: common/models.py:861
-msgid "Show latest parts on the homepage"
+msgid "Automatically fill out user-details from SSO account-data"
 msgstr ""
 
 #: common/models.py:866
-msgid "Recent Part Count"
+msgid "Mail twice"
 msgstr ""
 
 #: common/models.py:867
-msgid "Number of recent parts to display on index page"
+msgid "On signup ask users twice for their mail"
 msgstr ""
 
+#: common/models.py:872
+#, fuzzy
+#| msgid "Set Password"
+msgid "Password twice"
+msgstr "Configurar Contraseña"
+
 #: common/models.py:873
-msgid "Show unvalidated BOMs"
-msgstr ""
-
-#: common/models.py:874
-msgid "Show BOMs that await validation on the homepage"
-msgstr ""
-
-#: common/models.py:879
-msgid "Show recent stock changes"
-msgstr ""
-
-#: common/models.py:880
-msgid "Show recently changed stock items on the homepage"
-msgstr ""
-
-#: common/models.py:885
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:886
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:891
-msgid "Show low stock"
-msgstr ""
-
-#: common/models.py:892
-msgid "Show low stock items on the homepage"
-msgstr ""
-
-#: common/models.py:897
-msgid "Show depleted stock"
+msgid "On signup ask users twice for their password"
 msgstr ""
 
 #: common/models.py:898
-msgid "Show depleted stock items on the homepage"
+msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:903
-msgid "Show needed stock"
+#: common/models.py:899
+msgid "Show starred parts on the homepage"
 msgstr ""
 
 #: common/models.py:904
-msgid "Show stock items needed for builds on the homepage"
+msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:909
-msgid "Show expired stock"
+#: common/models.py:905
+msgid "Show latest parts on the homepage"
 msgstr ""
 
 #: common/models.py:910
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:911
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:917
+msgid "Show unvalidated BOMs"
+msgstr ""
+
+#: common/models.py:918
+msgid "Show BOMs that await validation on the homepage"
+msgstr ""
+
+#: common/models.py:923
+msgid "Show recent stock changes"
+msgstr ""
+
+#: common/models.py:924
+msgid "Show recently changed stock items on the homepage"
+msgstr ""
+
+#: common/models.py:929
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:930
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:935
+msgid "Show low stock"
+msgstr ""
+
+#: common/models.py:936
+msgid "Show low stock items on the homepage"
+msgstr ""
+
+#: common/models.py:941
+msgid "Show depleted stock"
+msgstr ""
+
+#: common/models.py:942
+msgid "Show depleted stock items on the homepage"
+msgstr ""
+
+#: common/models.py:947
+msgid "Show needed stock"
+msgstr ""
+
+#: common/models.py:948
+msgid "Show stock items needed for builds on the homepage"
+msgstr ""
+
+#: common/models.py:953
+msgid "Show expired stock"
+msgstr ""
+
+#: common/models.py:954
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:915
+#: common/models.py:959
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:916
+#: common/models.py:960
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:921
+#: common/models.py:965
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:922
+#: common/models.py:966
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:927
+#: common/models.py:971
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:928
+#: common/models.py:972
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:933
+#: common/models.py:977
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:934
+#: common/models.py:978
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:939
+#: common/models.py:983
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:940
+#: common/models.py:984
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:945
+#: common/models.py:989
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:946
+#: common/models.py:990
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:951
+#: common/models.py:995
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:952
+#: common/models.py:996
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:958
+#: common/models.py:1002
 msgid "Inline label display"
 msgstr ""
 
-#: common/models.py:959
+#: common/models.py:1003
 msgid "Display PDF labels in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:965
+#: common/models.py:1009
 msgid "Inline report display"
 msgstr ""
 
-#: common/models.py:966
+#: common/models.py:1010
 msgid "Display PDF reports in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:972
+#: common/models.py:1016
 msgid "Search Preview Results"
 msgstr ""
 
-#: common/models.py:973
+#: common/models.py:1017
 msgid "Number of results to show in search preview window"
 msgstr ""
 
-#: common/models.py:979
+#: common/models.py:1023
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:980
+#: common/models.py:1024
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:986
+#: common/models.py:1030
 msgid "Escape Key Closes Forms"
 msgstr ""
 
-#: common/models.py:987
+#: common/models.py:1031
 msgid "Use the escape key to close modal forms"
 msgstr ""
 
-#: common/models.py:1044 company/forms.py:43
+#: common/models.py:1088 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:1051 company/templates/company/supplier_part.html:231
+#: common/models.py:1095 company/templates/company/supplier_part.html:231
 #: templates/js/translated/part.js:1369
 msgid "Price"
 msgstr ""
 
-#: common/models.py:1052
+#: common/models.py:1096
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1145
+#: common/models.py:1189
 msgid "Default"
 msgstr ""
 
@@ -2601,8 +2674,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:82
 #: part/templates/part/navbar.html:85 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:229
-#: templates/InvenTree/settings/navbar.html:113
-#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:119
+#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:44
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2625,8 +2698,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:91
 #: part/templates/part/navbar.html:94 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:249
-#: templates/InvenTree/settings/navbar.html:119
-#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:55
+#: templates/InvenTree/settings/navbar.html:125
+#: templates/InvenTree/settings/navbar.html:127 templates/navbar.html:55
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2712,7 +2785,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part.html:239
 #: part/templates/part/detail.html:214 part/templates/part/detail.html:294
 #: part/templates/part/detail.html:317 templates/js/translated/company.js:424
-#: templates/js/translated/helpers.js:31 users/models.py:194
+#: templates/js/translated/helpers.js:31 users/models.py:199
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -2761,8 +2834,8 @@ msgstr ""
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:182
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109
 #: templates/js/translated/part.js:540 templates/js/translated/part.js:769
 #: templates/js/translated/part.js:945 templates/js/translated/stock.js:182
 #: templates/js/translated/stock.js:829 templates/navbar.html:32
@@ -3724,8 +3797,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
 #: templates/js/translated/part.js:1165 templates/navbar.html:29
 #: templates/stats.html:80 templates/stats.html:89 users/models.py:41
 msgid "Parts"
@@ -3939,7 +4012,7 @@ msgstr ""
 
 #: part/models.py:696 part/models.py:2299
 #: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:168
+#: templates/InvenTree/settings/settings.html:169
 #: templates/js/translated/part.js:927
 msgid "Category"
 msgstr ""
@@ -4129,7 +4202,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2256 part/models.py:2305 part/models.py:2306
-#: templates/InvenTree/settings/settings.html:163
+#: templates/InvenTree/settings/settings.html:164
 msgid "Parameter Template"
 msgstr ""
 
@@ -4141,7 +4214,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2310 templates/InvenTree/settings/settings.html:172
+#: part/models.py:2310 templates/InvenTree/settings/settings.html:173
 msgid "Default Value"
 msgstr ""
 
@@ -6159,6 +6232,14 @@ msgstr ""
 msgid "Setting"
 msgstr ""
 
+#: templates/InvenTree/settings/login.html:9
+msgid "Login Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/login.html:22 templates/account/signup.html:5
+msgid "Signup"
+msgstr ""
+
 #: templates/InvenTree/settings/navbar.html:12
 #: templates/InvenTree/settings/user_settings.html:9
 msgid "User Settings"
@@ -6212,22 +6293,27 @@ msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
-msgid "Barcodes"
+#: templates/InvenTree/settings/navbar.html:73 templates/navbar.html:87
+msgid "Login"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:77
 #: templates/InvenTree/settings/navbar.html:79
-msgid "Currencies"
+msgid "Barcodes"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:83
 #: templates/InvenTree/settings/navbar.html:85
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
 msgid "Reporting"
 msgstr ""
 
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103
 msgid "Categories"
 msgstr ""
 
@@ -6268,21 +6354,21 @@ msgstr ""
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:153
+#: templates/InvenTree/settings/settings.html:154
 msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:175
-#: templates/InvenTree/settings/settings.html:274
-msgid "Edit Template"
-msgstr ""
-
 #: templates/InvenTree/settings/settings.html:176
 #: templates/InvenTree/settings/settings.html:275
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/settings.html:177
+#: templates/InvenTree/settings/settings.html:276
 msgid "Delete Template"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:254
+#: templates/InvenTree/settings/settings.html:255
 msgid "No part parameter templates found"
 msgstr ""
 
@@ -6294,70 +6380,140 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:9
+#: templates/InvenTree/settings/user.html:11
 msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:15
+#: templates/InvenTree/settings/user.html:19
 #: templates/js/translated/helpers.js:26
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:17
+#: templates/InvenTree/settings/user.html:21
+#: templates/account/password_reset_from_key.html:4
+#: templates/account/password_reset_from_key.html:7
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:24
-#: templates/registration/login.html:58
+#: templates/InvenTree/settings/user.html:28
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:32
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:36
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
-msgid "Email Address"
+#: templates/InvenTree/settings/user.html:42
+msgid "E-Mail"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:42
-msgid "Theme Settings"
+#: templates/InvenTree/settings/user.html:47
+msgid "The following e-mail addresses are associated with your account:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:61
+msgid "Verified"
 msgstr ""
 
 #: templates/InvenTree/settings/user.html:63
+msgid "Unverified"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:65
+msgid "Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:71
+msgid "Make Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:72
+msgid "Re-send Verification"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:73
+#: templates/InvenTree/settings/user.html:130
+msgid "Remove"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:80
+msgid "Warning:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:81
+msgid "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."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:88
+msgid "Add E-mail Address"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:93
+#, fuzzy
+#| msgid "Email"
+msgid "Add E-mail"
+msgstr "Email"
+
+#: templates/InvenTree/settings/user.html:100
+#, fuzzy
+#| msgid "Stock counted"
+msgid "Social Accounts"
+msgstr "Stock contado"
+
+#: templates/InvenTree/settings/user.html:105
+msgid "You can sign in to your account using any of the following third party accounts:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:138
+msgid "You currently have no social network accounts connected to this account."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:142
+msgid "Add a 3rd Party Account"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:153
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:174
 msgid "Set Theme"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:70
+#: templates/InvenTree/settings/user.html:181
 msgid "Language Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:89
+#: templates/InvenTree/settings/user.html:200
 #, python-format
 msgid "%(lang_translated)s%% translated"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:91
+#: templates/InvenTree/settings/user.html:202
 msgid "No translations available"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:98
+#: templates/InvenTree/settings/user.html:209
 msgid "Set Language"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:103
+#: templates/InvenTree/settings/user.html:214
 msgid "Help the translation efforts!"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:104
+#: templates/InvenTree/settings/user.html:215
 #, python-format
 msgid "Native language translation of the InvenTree web application is <a href=\"%(link)s\">community contributed via crowdin</a>. Contributions are welcomed and encouraged."
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:223
+msgid "Do you really want to remove the selected e-mail address?"
+msgstr ""
+
 #: templates/InvenTree/settings/user_forms.html:9
 msgid "Form Settings"
 msgstr ""
@@ -6449,6 +6605,113 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#: templates/account/email_confirm.html:6
+#: templates/account/email_confirm.html:10
+msgid "Confirm E-mail Address"
+msgstr ""
+
+#: templates/account/email_confirm.html:16
+#, python-format
+msgid "Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail address for user %(user_display)s."
+msgstr ""
+
+#: templates/account/email_confirm.html:27
+#, python-format
+msgid "This e-mail confirmation link expired or is invalid. Please <a href=\"%(email_url)s\">issue a new e-mail confirmation request</a>."
+msgstr ""
+
+#: templates/account/login.html:5 templates/account/login.html:14
+#: templates/account/login.html:36
+msgid "Sign In"
+msgstr ""
+
+#: templates/account/login.html:19
+#, python-format
+msgid ""
+"Please sign in with one\n"
+"of your existing third party accounts or  <a class=\"btn btn-primary btn-small\" href=\"%(signup_url)s\">sign up</a>\n"
+"for a account and sign in below:"
+msgstr ""
+
+#: templates/account/login.html:23
+#, python-format
+msgid ""
+"If you have not created an account yet, then please\n"
+"<a href=\"%(signup_url)s\">sign up</a> first."
+msgstr ""
+
+#: templates/account/login.html:38
+#, fuzzy
+#| msgid "Set Password"
+msgid "Forgot Password?"
+msgstr "Configurar Contraseña"
+
+#: templates/account/login.html:45
+msgid "or use SSO"
+msgstr ""
+
+#: templates/account/logout.html:5 templates/account/logout.html:8
+#: templates/account/logout.html:17
+msgid "Sign Out"
+msgstr ""
+
+#: templates/account/logout.html:10
+msgid "Are you sure you want to sign out?"
+msgstr ""
+
+#: templates/account/password_reset.html:5
+#: templates/account/password_reset.html:12
+#, fuzzy
+#| msgid "Set Password"
+msgid "Password Reset"
+msgstr "Configurar Contraseña"
+
+#: templates/account/password_reset.html:18
+msgid "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it."
+msgstr ""
+
+#: templates/account/password_reset.html:23
+#, fuzzy
+#| msgid "Set Password"
+msgid "Reset My Password"
+msgstr "Configurar Contraseña"
+
+#: templates/account/password_reset.html:27 templates/account/signup.html:36
+msgid "This function is currently disabled. Please contact an administrator."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:7
+msgid "Bad Token"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:11
+#, python-format
+msgid "The password reset link was invalid, possibly because it has already been used.  Please request a <a href=\"%(passwd_reset_url)s\">new password reset</a>."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:17
+#, fuzzy
+#| msgid "Enter password"
+msgid "change password"
+msgstr "Introduzca contraseña"
+
+#: templates/account/password_reset_from_key.html:20
+msgid "Your password is now changed."
+msgstr ""
+
+#: templates/account/signup.html:11 templates/account/signup.html:22
+msgid "Sign Up"
+msgstr ""
+
+#: templates/account/signup.html:13
+#, python-format
+msgid "Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>."
+msgstr ""
+
+#: templates/account/signup.html:27
+msgid "Or use a SSO-provider for signup"
+msgstr ""
+
 #: templates/image_download.html:8
 msgid "Specify URL for downloading image"
 msgstr ""
@@ -7612,7 +7875,7 @@ msgstr ""
 msgid "Add Stock"
 msgstr ""
 
-#: templates/js/translated/stock.js:165 users/models.py:190
+#: templates/js/translated/stock.js:165 users/models.py:195
 msgid "Add"
 msgstr ""
 
@@ -8069,10 +8332,6 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: templates/navbar.html:87 templates/registration/login.html:89
-msgid "Login"
-msgstr ""
-
 #: templates/navbar.html:106
 msgid "About InvenTree"
 msgstr ""
@@ -8081,68 +8340,12 @@ msgstr ""
 msgid "QR data not provided"
 msgstr ""
 
-#: templates/registration/logged_out.html:50
-msgid "You have been logged out"
+#: templates/registration/logged_out.html:6
+msgid "You were logged out successfully."
 msgstr ""
 
-#: templates/registration/logged_out.html:51
-#: templates/registration/password_reset_complete.html:51
-#: templates/registration/password_reset_done.html:58
-msgid "Return to login screen"
-msgstr ""
-
-#: templates/registration/login.html:64
-msgid "Enter username"
-msgstr ""
-
-#: templates/registration/login.html:70
-msgid "Password"
-msgstr ""
-
-#: templates/registration/login.html:83
-msgid "Username / password combination is incorrect"
-msgstr ""
-
-#: templates/registration/login.html:95
-#: templates/registration/password_reset_form.html:51
-msgid "Forgotten your password?"
-msgstr ""
-
-#: templates/registration/login.html:95
-msgid "Click here to reset"
-msgstr ""
-
-#: templates/registration/password_reset_complete.html:50
-msgid "Password reset complete"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:52
-#: templates/registration/password_reset_confirm.html:56
-msgid "Change password"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:60
-msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:51
-msgid "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:54
-msgid "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:52
-msgid "Enter your email address below."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:53
-msgid "An email will be sent with password reset instructions."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:58
-msgid "Send email"
+#: templates/registration/logged_out.html:8
+msgid "Log in again"
 msgstr ""
 
 #: templates/stats.html:13
@@ -8281,34 +8484,34 @@ msgstr ""
 msgid "Important dates"
 msgstr ""
 
-#: users/models.py:177
+#: users/models.py:182
 msgid "Permission set"
 msgstr ""
 
-#: users/models.py:185
+#: users/models.py:190
 msgid "Group"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "View"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "Permission to view items"
 msgstr ""
 
-#: users/models.py:190
+#: users/models.py:195
 msgid "Permission to add items"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Change"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Permissions to edit items"
 msgstr ""
 
-#: users/models.py:194
+#: users/models.py:199
 msgid "Permission to delete items"
 msgstr ""
diff --git a/InvenTree/locale/fr/LC_MESSAGES/django.po b/InvenTree/locale/fr/LC_MESSAGES/django.po
index b37882bac2..94964d6a7d 100644
--- a/InvenTree/locale/fr/LC_MESSAGES/django.po
+++ b/InvenTree/locale/fr/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-11 01:01+0000\n"
+"POT-Creation-Date: 2021-10-11 06:21+0000\n"
 "PO-Revision-Date: 2021-09-12 13:44\n"
 "Last-Translator: \n"
 "Language-Team: French\n"
@@ -33,41 +33,54 @@ msgstr "Aucune action correspondante trouvée"
 msgid "Enter date"
 msgstr "Entrer la date"
 
-#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:116 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:173 build/forms.py:215 order/forms.py:27
 #: order/forms.py:38 order/forms.py:49 order/forms.py:60 order/forms.py:71
-#: part/forms.py:108 templates/js/translated/forms.js:564
+#: part/forms.py:108 templates/account/email_confirm.html:20
+#: templates/js/translated/forms.js:564
 msgid "Confirm"
 msgstr "Confirmer"
 
-#: InvenTree/forms.py:127
+#: InvenTree/forms.py:132
 msgid "Confirm delete"
 msgstr "Confirmer la suppression"
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:133
 msgid "Confirm item deletion"
 msgstr "Confirmer la suppression de cet élément"
 
-#: InvenTree/forms.py:160 templates/registration/login.html:76
+#: InvenTree/forms.py:164
 msgid "Enter password"
 msgstr "Entrer le mot de passe"
 
-#: InvenTree/forms.py:161
+#: InvenTree/forms.py:165
 msgid "Enter new password"
 msgstr "Entrer le nouveau mot de passe"
 
-#: InvenTree/forms.py:168
+#: InvenTree/forms.py:172
 msgid "Confirm password"
 msgstr "Confirmez le mot de passe"
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:173
 msgid "Confirm new password"
 msgstr "Confirmer le nouveau mot de passe"
 
-#: InvenTree/forms.py:201
+#: InvenTree/forms.py:205
 msgid "Select Category"
 msgstr "Sélectionnez une catégorie"
 
+#: InvenTree/forms.py:226
+msgid "E-mail (again)"
+msgstr ""
+
+#: InvenTree/forms.py:230
+msgid "E-mail address confirmation"
+msgstr ""
+
+#: InvenTree/forms.py:250
+msgid "You must type the same email each time."
+msgstr ""
+
 #: InvenTree/helpers.py:401
 #, python-brace-format
 msgid "Duplicate serial: {n}"
@@ -118,8 +131,8 @@ msgstr "Commentaire"
 msgid "File comment"
 msgstr "Commentaire du fichier"
 
-#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1011
-#: common/models.py:1012 part/models.py:2055
+#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1055
+#: common/models.py:1056 part/models.py:2055
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/translated/stock.js:1669
 msgid "User"
@@ -205,75 +218,75 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: InvenTree/settings.py:523
+#: InvenTree/settings.py:529
 msgid "German"
 msgstr "Allemand"
 
-#: InvenTree/settings.py:524
+#: InvenTree/settings.py:530
 msgid "Greek"
 msgstr ""
 
-#: InvenTree/settings.py:525
+#: InvenTree/settings.py:531
 msgid "English"
 msgstr "Anglais"
 
-#: InvenTree/settings.py:526
+#: InvenTree/settings.py:532
 msgid "Spanish"
 msgstr ""
 
-#: InvenTree/settings.py:527
+#: InvenTree/settings.py:533
 msgid "French"
 msgstr "Français"
 
-#: InvenTree/settings.py:528
+#: InvenTree/settings.py:534
 msgid "Hebrew"
 msgstr ""
 
-#: InvenTree/settings.py:529
+#: InvenTree/settings.py:535
 msgid "Italian"
 msgstr ""
 
-#: InvenTree/settings.py:530
+#: InvenTree/settings.py:536
 msgid "Japanese"
 msgstr ""
 
-#: InvenTree/settings.py:531
+#: InvenTree/settings.py:537
 msgid "Korean"
 msgstr ""
 
-#: InvenTree/settings.py:532
+#: InvenTree/settings.py:538
 msgid "Dutch"
 msgstr ""
 
-#: InvenTree/settings.py:533
+#: InvenTree/settings.py:539
 msgid "Norwegian"
 msgstr ""
 
-#: InvenTree/settings.py:534
+#: InvenTree/settings.py:540
 msgid "Polish"
 msgstr "Polonais"
 
-#: InvenTree/settings.py:535
+#: InvenTree/settings.py:541
 msgid "Russian"
 msgstr ""
 
-#: InvenTree/settings.py:536
+#: InvenTree/settings.py:542
 msgid "Swedish"
 msgstr ""
 
-#: InvenTree/settings.py:537
+#: InvenTree/settings.py:543
 msgid "Thai"
 msgstr ""
 
-#: InvenTree/settings.py:538
+#: InvenTree/settings.py:544
 msgid "Turkish"
 msgstr "Turc"
 
-#: InvenTree/settings.py:539
+#: InvenTree/settings.py:545
 msgid "Vietnamese"
 msgstr ""
 
-#: InvenTree/settings.py:540
+#: InvenTree/settings.py:546
 msgid "Chinese"
 msgstr ""
 
@@ -458,27 +471,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:610
+#: InvenTree/views.py:616
 msgid "Delete Item"
 msgstr "Supprimer cet élément"
 
-#: InvenTree/views.py:659
+#: InvenTree/views.py:665
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:674 templates/InvenTree/settings/user.html:14
+#: InvenTree/views.py:680 templates/InvenTree/settings/user.html:18
 msgid "Edit User Information"
 msgstr "Modifier les informations utilisateur"
 
-#: InvenTree/views.py:685 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:691 templates/InvenTree/settings/user.html:22
 msgid "Set Password"
 msgstr ""
 
-#: InvenTree/views.py:704
+#: InvenTree/views.py:710
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:910 templates/navbar.html:97
+#: InvenTree/views.py:954 templates/navbar.html:97
 msgid "System Information"
 msgstr "Informations système"
 
@@ -551,7 +564,7 @@ msgstr ""
 #: build/forms.py:48 build/forms.py:90 build/models.py:1281
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:1043
+#: build/templates/build/detail.html:34 common/models.py:1087
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:101 order/forms.py:123 order/models.py:720
 #: order/models.py:982 order/templates/order/order_wizard/match_parts.html:30
@@ -681,8 +694,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:50
 #: part/templates/part/navbar.html:53 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:171
-#: templates/InvenTree/settings/navbar.html:107
-#: templates/InvenTree/settings/navbar.html:109 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1545,7 +1558,7 @@ msgstr "{name.title()} Fichier"
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:308 common/models.py:843 common/models.py:1004
+#: common/models.py:308 common/models.py:887 common/models.py:1048
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1959,196 +1972,254 @@ msgstr ""
 msgid "Enable PO functionality in InvenTree interface"
 msgstr ""
 
+#: common/models.py:836
+#, fuzzy
+#| msgid "Enter password"
+msgid "Enable password forgot"
+msgstr "Entrer le mot de passe"
+
+#: common/models.py:837
+msgid "Enable password forgot function on the login-pages"
+msgstr ""
+
+#: common/models.py:842
+msgid "Enable registration"
+msgstr ""
+
+#: common/models.py:843
+msgid "Enable self-registration for users on the login-pages"
+msgstr ""
+
+#: common/models.py:848
+msgid "Enable SSO"
+msgstr ""
+
+#: common/models.py:849
+msgid "Enable SSO on the login-pages"
+msgstr ""
+
 #: common/models.py:854
-msgid "Show starred parts"
+msgid "E-Mail required"
 msgstr ""
 
 #: common/models.py:855
-msgid "Show starred parts on the homepage"
+msgid "Require user to supply mail on signup"
 msgstr ""
 
 #: common/models.py:860
-msgid "Show latest parts"
+msgid "Auto-fill SSO users"
 msgstr ""
 
 #: common/models.py:861
-msgid "Show latest parts on the homepage"
+msgid "Automatically fill out user-details from SSO account-data"
 msgstr ""
 
 #: common/models.py:866
-msgid "Recent Part Count"
+msgid "Mail twice"
 msgstr ""
 
 #: common/models.py:867
-msgid "Number of recent parts to display on index page"
+msgid "On signup ask users twice for their mail"
+msgstr ""
+
+#: common/models.py:872
+msgid "Password twice"
 msgstr ""
 
 #: common/models.py:873
-msgid "Show unvalidated BOMs"
-msgstr ""
-
-#: common/models.py:874
-msgid "Show BOMs that await validation on the homepage"
-msgstr ""
-
-#: common/models.py:879
-msgid "Show recent stock changes"
-msgstr ""
-
-#: common/models.py:880
-msgid "Show recently changed stock items on the homepage"
-msgstr ""
-
-#: common/models.py:885
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:886
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:891
-msgid "Show low stock"
-msgstr ""
-
-#: common/models.py:892
-msgid "Show low stock items on the homepage"
-msgstr ""
-
-#: common/models.py:897
-msgid "Show depleted stock"
+msgid "On signup ask users twice for their password"
 msgstr ""
 
 #: common/models.py:898
-msgid "Show depleted stock items on the homepage"
+msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:903
-msgid "Show needed stock"
+#: common/models.py:899
+msgid "Show starred parts on the homepage"
 msgstr ""
 
 #: common/models.py:904
-msgid "Show stock items needed for builds on the homepage"
+msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:909
-msgid "Show expired stock"
+#: common/models.py:905
+msgid "Show latest parts on the homepage"
 msgstr ""
 
 #: common/models.py:910
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:911
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:917
+msgid "Show unvalidated BOMs"
+msgstr ""
+
+#: common/models.py:918
+msgid "Show BOMs that await validation on the homepage"
+msgstr ""
+
+#: common/models.py:923
+msgid "Show recent stock changes"
+msgstr ""
+
+#: common/models.py:924
+msgid "Show recently changed stock items on the homepage"
+msgstr ""
+
+#: common/models.py:929
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:930
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:935
+msgid "Show low stock"
+msgstr ""
+
+#: common/models.py:936
+msgid "Show low stock items on the homepage"
+msgstr ""
+
+#: common/models.py:941
+msgid "Show depleted stock"
+msgstr ""
+
+#: common/models.py:942
+msgid "Show depleted stock items on the homepage"
+msgstr ""
+
+#: common/models.py:947
+msgid "Show needed stock"
+msgstr ""
+
+#: common/models.py:948
+msgid "Show stock items needed for builds on the homepage"
+msgstr ""
+
+#: common/models.py:953
+msgid "Show expired stock"
+msgstr ""
+
+#: common/models.py:954
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:915
+#: common/models.py:959
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:916
+#: common/models.py:960
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:921
+#: common/models.py:965
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:922
+#: common/models.py:966
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:927
+#: common/models.py:971
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:928
+#: common/models.py:972
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:933
+#: common/models.py:977
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:934
+#: common/models.py:978
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:939
+#: common/models.py:983
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:940
+#: common/models.py:984
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:945
+#: common/models.py:989
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:946
+#: common/models.py:990
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:951
+#: common/models.py:995
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:952
+#: common/models.py:996
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:958
+#: common/models.py:1002
 msgid "Inline label display"
 msgstr ""
 
-#: common/models.py:959
+#: common/models.py:1003
 msgid "Display PDF labels in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:965
+#: common/models.py:1009
 msgid "Inline report display"
 msgstr ""
 
-#: common/models.py:966
+#: common/models.py:1010
 msgid "Display PDF reports in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:972
+#: common/models.py:1016
 msgid "Search Preview Results"
 msgstr ""
 
-#: common/models.py:973
+#: common/models.py:1017
 msgid "Number of results to show in search preview window"
 msgstr ""
 
-#: common/models.py:979
+#: common/models.py:1023
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:980
+#: common/models.py:1024
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:986
+#: common/models.py:1030
 msgid "Escape Key Closes Forms"
 msgstr ""
 
-#: common/models.py:987
+#: common/models.py:1031
 msgid "Use the escape key to close modal forms"
 msgstr ""
 
-#: common/models.py:1044 company/forms.py:43
+#: common/models.py:1088 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:1051 company/templates/company/supplier_part.html:231
+#: common/models.py:1095 company/templates/company/supplier_part.html:231
 #: templates/js/translated/part.js:1369
 msgid "Price"
 msgstr ""
 
-#: common/models.py:1052
+#: common/models.py:1096
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1145
+#: common/models.py:1189
 msgid "Default"
 msgstr ""
 
@@ -2597,8 +2668,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:82
 #: part/templates/part/navbar.html:85 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:229
-#: templates/InvenTree/settings/navbar.html:113
-#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:119
+#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:44
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2621,8 +2692,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:91
 #: part/templates/part/navbar.html:94 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:249
-#: templates/InvenTree/settings/navbar.html:119
-#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:55
+#: templates/InvenTree/settings/navbar.html:125
+#: templates/InvenTree/settings/navbar.html:127 templates/navbar.html:55
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2708,7 +2779,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part.html:239
 #: part/templates/part/detail.html:214 part/templates/part/detail.html:294
 #: part/templates/part/detail.html:317 templates/js/translated/company.js:424
-#: templates/js/translated/helpers.js:31 users/models.py:194
+#: templates/js/translated/helpers.js:31 users/models.py:199
 msgid "Delete"
 msgstr ""
 
@@ -2757,8 +2828,8 @@ msgstr ""
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:182
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109
 #: templates/js/translated/part.js:540 templates/js/translated/part.js:769
 #: templates/js/translated/part.js:945 templates/js/translated/stock.js:182
 #: templates/js/translated/stock.js:829 templates/navbar.html:32
@@ -3718,8 +3789,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
 #: templates/js/translated/part.js:1165 templates/navbar.html:29
 #: templates/stats.html:80 templates/stats.html:89 users/models.py:41
 msgid "Parts"
@@ -3933,7 +4004,7 @@ msgstr ""
 
 #: part/models.py:696 part/models.py:2299
 #: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:168
+#: templates/InvenTree/settings/settings.html:169
 #: templates/js/translated/part.js:927
 msgid "Category"
 msgstr ""
@@ -4123,7 +4194,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2256 part/models.py:2305 part/models.py:2306
-#: templates/InvenTree/settings/settings.html:163
+#: templates/InvenTree/settings/settings.html:164
 msgid "Parameter Template"
 msgstr ""
 
@@ -4135,7 +4206,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2310 templates/InvenTree/settings/settings.html:172
+#: part/models.py:2310 templates/InvenTree/settings/settings.html:173
 msgid "Default Value"
 msgstr ""
 
@@ -6151,6 +6222,14 @@ msgstr ""
 msgid "Setting"
 msgstr ""
 
+#: templates/InvenTree/settings/login.html:9
+msgid "Login Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/login.html:22 templates/account/signup.html:5
+msgid "Signup"
+msgstr ""
+
 #: templates/InvenTree/settings/navbar.html:12
 #: templates/InvenTree/settings/user_settings.html:9
 msgid "User Settings"
@@ -6204,22 +6283,27 @@ msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
-msgid "Barcodes"
+#: templates/InvenTree/settings/navbar.html:73 templates/navbar.html:87
+msgid "Login"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:77
 #: templates/InvenTree/settings/navbar.html:79
-msgid "Currencies"
+msgid "Barcodes"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:83
 #: templates/InvenTree/settings/navbar.html:85
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
 msgid "Reporting"
 msgstr ""
 
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103
 msgid "Categories"
 msgstr ""
 
@@ -6260,21 +6344,21 @@ msgstr ""
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:153
+#: templates/InvenTree/settings/settings.html:154
 msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:175
-#: templates/InvenTree/settings/settings.html:274
-msgid "Edit Template"
-msgstr ""
-
 #: templates/InvenTree/settings/settings.html:176
 #: templates/InvenTree/settings/settings.html:275
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/settings.html:177
+#: templates/InvenTree/settings/settings.html:276
 msgid "Delete Template"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:254
+#: templates/InvenTree/settings/settings.html:255
 msgid "No part parameter templates found"
 msgstr ""
 
@@ -6286,70 +6370,138 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:9
+#: templates/InvenTree/settings/user.html:11
 msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:15
+#: templates/InvenTree/settings/user.html:19
 #: templates/js/translated/helpers.js:26
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:17
+#: templates/InvenTree/settings/user.html:21
+#: templates/account/password_reset_from_key.html:4
+#: templates/account/password_reset_from_key.html:7
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:24
-#: templates/registration/login.html:58
+#: templates/InvenTree/settings/user.html:28
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:32
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:36
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
-msgid "Email Address"
+#: templates/InvenTree/settings/user.html:42
+msgid "E-Mail"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:42
-msgid "Theme Settings"
+#: templates/InvenTree/settings/user.html:47
+msgid "The following e-mail addresses are associated with your account:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:61
+msgid "Verified"
 msgstr ""
 
 #: templates/InvenTree/settings/user.html:63
+msgid "Unverified"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:65
+msgid "Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:71
+msgid "Make Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:72
+msgid "Re-send Verification"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:73
+#: templates/InvenTree/settings/user.html:130
+msgid "Remove"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:80
+msgid "Warning:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:81
+msgid "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."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:88
+msgid "Add E-mail Address"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:93
+msgid "Add E-mail"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:100
+#, fuzzy
+#| msgid "Stock counted"
+msgid "Social Accounts"
+msgstr "Stock comptabilisé"
+
+#: templates/InvenTree/settings/user.html:105
+msgid "You can sign in to your account using any of the following third party accounts:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:138
+msgid "You currently have no social network accounts connected to this account."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:142
+msgid "Add a 3rd Party Account"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:153
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:174
 msgid "Set Theme"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:70
+#: templates/InvenTree/settings/user.html:181
 msgid "Language Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:89
+#: templates/InvenTree/settings/user.html:200
 #, python-format
 msgid "%(lang_translated)s%% translated"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:91
+#: templates/InvenTree/settings/user.html:202
 msgid "No translations available"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:98
+#: templates/InvenTree/settings/user.html:209
 msgid "Set Language"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:103
+#: templates/InvenTree/settings/user.html:214
 msgid "Help the translation efforts!"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:104
+#: templates/InvenTree/settings/user.html:215
 #, python-format
 msgid "Native language translation of the InvenTree web application is <a href=\"%(link)s\">community contributed via crowdin</a>. Contributions are welcomed and encouraged."
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:223
+msgid "Do you really want to remove the selected e-mail address?"
+msgstr ""
+
 #: templates/InvenTree/settings/user_forms.html:9
 msgid "Form Settings"
 msgstr ""
@@ -6441,6 +6593,109 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#: templates/account/email_confirm.html:6
+#: templates/account/email_confirm.html:10
+msgid "Confirm E-mail Address"
+msgstr ""
+
+#: templates/account/email_confirm.html:16
+#, python-format
+msgid "Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail address for user %(user_display)s."
+msgstr ""
+
+#: templates/account/email_confirm.html:27
+#, python-format
+msgid "This e-mail confirmation link expired or is invalid. Please <a href=\"%(email_url)s\">issue a new e-mail confirmation request</a>."
+msgstr ""
+
+#: templates/account/login.html:5 templates/account/login.html:14
+#: templates/account/login.html:36
+msgid "Sign In"
+msgstr ""
+
+#: templates/account/login.html:19
+#, python-format
+msgid ""
+"Please sign in with one\n"
+"of your existing third party accounts or  <a class=\"btn btn-primary btn-small\" href=\"%(signup_url)s\">sign up</a>\n"
+"for a account and sign in below:"
+msgstr ""
+
+#: templates/account/login.html:23
+#, python-format
+msgid ""
+"If you have not created an account yet, then please\n"
+"<a href=\"%(signup_url)s\">sign up</a> first."
+msgstr ""
+
+#: templates/account/login.html:38
+#, fuzzy
+#| msgid "Confirm password"
+msgid "Forgot Password?"
+msgstr "Confirmez le mot de passe"
+
+#: templates/account/login.html:45
+msgid "or use SSO"
+msgstr ""
+
+#: templates/account/logout.html:5 templates/account/logout.html:8
+#: templates/account/logout.html:17
+msgid "Sign Out"
+msgstr ""
+
+#: templates/account/logout.html:10
+msgid "Are you sure you want to sign out?"
+msgstr ""
+
+#: templates/account/password_reset.html:5
+#: templates/account/password_reset.html:12
+msgid "Password Reset"
+msgstr ""
+
+#: templates/account/password_reset.html:18
+msgid "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it."
+msgstr ""
+
+#: templates/account/password_reset.html:23
+msgid "Reset My Password"
+msgstr ""
+
+#: templates/account/password_reset.html:27 templates/account/signup.html:36
+msgid "This function is currently disabled. Please contact an administrator."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:7
+msgid "Bad Token"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:11
+#, python-format
+msgid "The password reset link was invalid, possibly because it has already been used.  Please request a <a href=\"%(passwd_reset_url)s\">new password reset</a>."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:17
+#, fuzzy
+#| msgid "Enter password"
+msgid "change password"
+msgstr "Entrer le mot de passe"
+
+#: templates/account/password_reset_from_key.html:20
+msgid "Your password is now changed."
+msgstr ""
+
+#: templates/account/signup.html:11 templates/account/signup.html:22
+msgid "Sign Up"
+msgstr ""
+
+#: templates/account/signup.html:13
+#, python-format
+msgid "Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>."
+msgstr ""
+
+#: templates/account/signup.html:27
+msgid "Or use a SSO-provider for signup"
+msgstr ""
+
 #: templates/image_download.html:8
 msgid "Specify URL for downloading image"
 msgstr ""
@@ -7600,7 +7855,7 @@ msgstr ""
 msgid "Add Stock"
 msgstr ""
 
-#: templates/js/translated/stock.js:165 users/models.py:190
+#: templates/js/translated/stock.js:165 users/models.py:195
 msgid "Add"
 msgstr ""
 
@@ -8057,10 +8312,6 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: templates/navbar.html:87 templates/registration/login.html:89
-msgid "Login"
-msgstr ""
-
 #: templates/navbar.html:106
 msgid "About InvenTree"
 msgstr ""
@@ -8069,68 +8320,12 @@ msgstr ""
 msgid "QR data not provided"
 msgstr ""
 
-#: templates/registration/logged_out.html:50
-msgid "You have been logged out"
+#: templates/registration/logged_out.html:6
+msgid "You were logged out successfully."
 msgstr ""
 
-#: templates/registration/logged_out.html:51
-#: templates/registration/password_reset_complete.html:51
-#: templates/registration/password_reset_done.html:58
-msgid "Return to login screen"
-msgstr ""
-
-#: templates/registration/login.html:64
-msgid "Enter username"
-msgstr ""
-
-#: templates/registration/login.html:70
-msgid "Password"
-msgstr ""
-
-#: templates/registration/login.html:83
-msgid "Username / password combination is incorrect"
-msgstr ""
-
-#: templates/registration/login.html:95
-#: templates/registration/password_reset_form.html:51
-msgid "Forgotten your password?"
-msgstr ""
-
-#: templates/registration/login.html:95
-msgid "Click here to reset"
-msgstr ""
-
-#: templates/registration/password_reset_complete.html:50
-msgid "Password reset complete"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:52
-#: templates/registration/password_reset_confirm.html:56
-msgid "Change password"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:60
-msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:51
-msgid "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:54
-msgid "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:52
-msgid "Enter your email address below."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:53
-msgid "An email will be sent with password reset instructions."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:58
-msgid "Send email"
+#: templates/registration/logged_out.html:8
+msgid "Log in again"
 msgstr ""
 
 #: templates/stats.html:13
@@ -8269,34 +8464,34 @@ msgstr ""
 msgid "Important dates"
 msgstr ""
 
-#: users/models.py:177
+#: users/models.py:182
 msgid "Permission set"
 msgstr ""
 
-#: users/models.py:185
+#: users/models.py:190
 msgid "Group"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "View"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "Permission to view items"
 msgstr ""
 
-#: users/models.py:190
+#: users/models.py:195
 msgid "Permission to add items"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Change"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Permissions to edit items"
 msgstr ""
 
-#: users/models.py:194
+#: users/models.py:199
 msgid "Permission to delete items"
 msgstr ""
diff --git a/InvenTree/locale/he/LC_MESSAGES/django.po b/InvenTree/locale/he/LC_MESSAGES/django.po
index cd7e306d53..ecb3d15094 100644
--- a/InvenTree/locale/he/LC_MESSAGES/django.po
+++ b/InvenTree/locale/he/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-11 01:01+0000\n"
+"POT-Creation-Date: 2021-10-11 06:21+0000\n"
 "PO-Revision-Date: 2021-09-12 13:44\n"
 "Last-Translator: \n"
 "Language-Team: Hebrew\n"
@@ -33,41 +33,54 @@ msgstr ""
 msgid "Enter date"
 msgstr ""
 
-#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:116 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:173 build/forms.py:215 order/forms.py:27
 #: order/forms.py:38 order/forms.py:49 order/forms.py:60 order/forms.py:71
-#: part/forms.py:108 templates/js/translated/forms.js:564
+#: part/forms.py:108 templates/account/email_confirm.html:20
+#: templates/js/translated/forms.js:564
 msgid "Confirm"
 msgstr ""
 
-#: InvenTree/forms.py:127
+#: InvenTree/forms.py:132
 msgid "Confirm delete"
 msgstr ""
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:133
 msgid "Confirm item deletion"
 msgstr ""
 
-#: InvenTree/forms.py:160 templates/registration/login.html:76
+#: InvenTree/forms.py:164
 msgid "Enter password"
 msgstr ""
 
-#: InvenTree/forms.py:161
+#: InvenTree/forms.py:165
 msgid "Enter new password"
 msgstr ""
 
-#: InvenTree/forms.py:168
+#: InvenTree/forms.py:172
 msgid "Confirm password"
 msgstr ""
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:173
 msgid "Confirm new password"
 msgstr ""
 
-#: InvenTree/forms.py:201
+#: InvenTree/forms.py:205
 msgid "Select Category"
 msgstr ""
 
+#: InvenTree/forms.py:226
+msgid "E-mail (again)"
+msgstr ""
+
+#: InvenTree/forms.py:230
+msgid "E-mail address confirmation"
+msgstr ""
+
+#: InvenTree/forms.py:250
+msgid "You must type the same email each time."
+msgstr ""
+
 #: InvenTree/helpers.py:401
 #, python-brace-format
 msgid "Duplicate serial: {n}"
@@ -118,8 +131,8 @@ msgstr ""
 msgid "File comment"
 msgstr ""
 
-#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1011
-#: common/models.py:1012 part/models.py:2055
+#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1055
+#: common/models.py:1056 part/models.py:2055
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/translated/stock.js:1669
 msgid "User"
@@ -205,75 +218,75 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: InvenTree/settings.py:523
+#: InvenTree/settings.py:529
 msgid "German"
 msgstr ""
 
-#: InvenTree/settings.py:524
+#: InvenTree/settings.py:530
 msgid "Greek"
 msgstr ""
 
-#: InvenTree/settings.py:525
+#: InvenTree/settings.py:531
 msgid "English"
 msgstr ""
 
-#: InvenTree/settings.py:526
+#: InvenTree/settings.py:532
 msgid "Spanish"
 msgstr ""
 
-#: InvenTree/settings.py:527
+#: InvenTree/settings.py:533
 msgid "French"
 msgstr ""
 
-#: InvenTree/settings.py:528
+#: InvenTree/settings.py:534
 msgid "Hebrew"
 msgstr ""
 
-#: InvenTree/settings.py:529
+#: InvenTree/settings.py:535
 msgid "Italian"
 msgstr ""
 
-#: InvenTree/settings.py:530
+#: InvenTree/settings.py:536
 msgid "Japanese"
 msgstr ""
 
-#: InvenTree/settings.py:531
+#: InvenTree/settings.py:537
 msgid "Korean"
 msgstr ""
 
-#: InvenTree/settings.py:532
+#: InvenTree/settings.py:538
 msgid "Dutch"
 msgstr ""
 
-#: InvenTree/settings.py:533
+#: InvenTree/settings.py:539
 msgid "Norwegian"
 msgstr ""
 
-#: InvenTree/settings.py:534
+#: InvenTree/settings.py:540
 msgid "Polish"
 msgstr ""
 
-#: InvenTree/settings.py:535
+#: InvenTree/settings.py:541
 msgid "Russian"
 msgstr ""
 
-#: InvenTree/settings.py:536
+#: InvenTree/settings.py:542
 msgid "Swedish"
 msgstr ""
 
-#: InvenTree/settings.py:537
+#: InvenTree/settings.py:543
 msgid "Thai"
 msgstr ""
 
-#: InvenTree/settings.py:538
+#: InvenTree/settings.py:544
 msgid "Turkish"
 msgstr ""
 
-#: InvenTree/settings.py:539
+#: InvenTree/settings.py:545
 msgid "Vietnamese"
 msgstr ""
 
-#: InvenTree/settings.py:540
+#: InvenTree/settings.py:546
 msgid "Chinese"
 msgstr ""
 
@@ -458,27 +471,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:610
+#: InvenTree/views.py:616
 msgid "Delete Item"
 msgstr ""
 
-#: InvenTree/views.py:659
+#: InvenTree/views.py:665
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:674 templates/InvenTree/settings/user.html:14
+#: InvenTree/views.py:680 templates/InvenTree/settings/user.html:18
 msgid "Edit User Information"
 msgstr ""
 
-#: InvenTree/views.py:685 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:691 templates/InvenTree/settings/user.html:22
 msgid "Set Password"
 msgstr ""
 
-#: InvenTree/views.py:704
+#: InvenTree/views.py:710
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:910 templates/navbar.html:97
+#: InvenTree/views.py:954 templates/navbar.html:97
 msgid "System Information"
 msgstr ""
 
@@ -551,7 +564,7 @@ msgstr ""
 #: build/forms.py:48 build/forms.py:90 build/models.py:1281
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:1043
+#: build/templates/build/detail.html:34 common/models.py:1087
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:101 order/forms.py:123 order/models.py:720
 #: order/models.py:982 order/templates/order/order_wizard/match_parts.html:30
@@ -681,8 +694,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:50
 #: part/templates/part/navbar.html:53 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:171
-#: templates/InvenTree/settings/navbar.html:107
-#: templates/InvenTree/settings/navbar.html:109 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1541,7 +1554,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:308 common/models.py:843 common/models.py:1004
+#: common/models.py:308 common/models.py:887 common/models.py:1048
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1955,196 +1968,252 @@ msgstr ""
 msgid "Enable PO functionality in InvenTree interface"
 msgstr ""
 
+#: common/models.py:836
+msgid "Enable password forgot"
+msgstr ""
+
+#: common/models.py:837
+msgid "Enable password forgot function on the login-pages"
+msgstr ""
+
+#: common/models.py:842
+msgid "Enable registration"
+msgstr ""
+
+#: common/models.py:843
+msgid "Enable self-registration for users on the login-pages"
+msgstr ""
+
+#: common/models.py:848
+msgid "Enable SSO"
+msgstr ""
+
+#: common/models.py:849
+msgid "Enable SSO on the login-pages"
+msgstr ""
+
 #: common/models.py:854
-msgid "Show starred parts"
+msgid "E-Mail required"
 msgstr ""
 
 #: common/models.py:855
-msgid "Show starred parts on the homepage"
+msgid "Require user to supply mail on signup"
 msgstr ""
 
 #: common/models.py:860
-msgid "Show latest parts"
+msgid "Auto-fill SSO users"
 msgstr ""
 
 #: common/models.py:861
-msgid "Show latest parts on the homepage"
+msgid "Automatically fill out user-details from SSO account-data"
 msgstr ""
 
 #: common/models.py:866
-msgid "Recent Part Count"
+msgid "Mail twice"
 msgstr ""
 
 #: common/models.py:867
-msgid "Number of recent parts to display on index page"
+msgid "On signup ask users twice for their mail"
+msgstr ""
+
+#: common/models.py:872
+msgid "Password twice"
 msgstr ""
 
 #: common/models.py:873
-msgid "Show unvalidated BOMs"
-msgstr ""
-
-#: common/models.py:874
-msgid "Show BOMs that await validation on the homepage"
-msgstr ""
-
-#: common/models.py:879
-msgid "Show recent stock changes"
-msgstr ""
-
-#: common/models.py:880
-msgid "Show recently changed stock items on the homepage"
-msgstr ""
-
-#: common/models.py:885
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:886
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:891
-msgid "Show low stock"
-msgstr ""
-
-#: common/models.py:892
-msgid "Show low stock items on the homepage"
-msgstr ""
-
-#: common/models.py:897
-msgid "Show depleted stock"
+msgid "On signup ask users twice for their password"
 msgstr ""
 
 #: common/models.py:898
-msgid "Show depleted stock items on the homepage"
+msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:903
-msgid "Show needed stock"
+#: common/models.py:899
+msgid "Show starred parts on the homepage"
 msgstr ""
 
 #: common/models.py:904
-msgid "Show stock items needed for builds on the homepage"
+msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:909
-msgid "Show expired stock"
+#: common/models.py:905
+msgid "Show latest parts on the homepage"
 msgstr ""
 
 #: common/models.py:910
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:911
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:917
+msgid "Show unvalidated BOMs"
+msgstr ""
+
+#: common/models.py:918
+msgid "Show BOMs that await validation on the homepage"
+msgstr ""
+
+#: common/models.py:923
+msgid "Show recent stock changes"
+msgstr ""
+
+#: common/models.py:924
+msgid "Show recently changed stock items on the homepage"
+msgstr ""
+
+#: common/models.py:929
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:930
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:935
+msgid "Show low stock"
+msgstr ""
+
+#: common/models.py:936
+msgid "Show low stock items on the homepage"
+msgstr ""
+
+#: common/models.py:941
+msgid "Show depleted stock"
+msgstr ""
+
+#: common/models.py:942
+msgid "Show depleted stock items on the homepage"
+msgstr ""
+
+#: common/models.py:947
+msgid "Show needed stock"
+msgstr ""
+
+#: common/models.py:948
+msgid "Show stock items needed for builds on the homepage"
+msgstr ""
+
+#: common/models.py:953
+msgid "Show expired stock"
+msgstr ""
+
+#: common/models.py:954
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:915
+#: common/models.py:959
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:916
+#: common/models.py:960
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:921
+#: common/models.py:965
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:922
+#: common/models.py:966
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:927
+#: common/models.py:971
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:928
+#: common/models.py:972
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:933
+#: common/models.py:977
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:934
+#: common/models.py:978
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:939
+#: common/models.py:983
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:940
+#: common/models.py:984
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:945
+#: common/models.py:989
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:946
+#: common/models.py:990
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:951
+#: common/models.py:995
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:952
+#: common/models.py:996
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:958
+#: common/models.py:1002
 msgid "Inline label display"
 msgstr ""
 
-#: common/models.py:959
+#: common/models.py:1003
 msgid "Display PDF labels in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:965
+#: common/models.py:1009
 msgid "Inline report display"
 msgstr ""
 
-#: common/models.py:966
+#: common/models.py:1010
 msgid "Display PDF reports in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:972
+#: common/models.py:1016
 msgid "Search Preview Results"
 msgstr ""
 
-#: common/models.py:973
+#: common/models.py:1017
 msgid "Number of results to show in search preview window"
 msgstr ""
 
-#: common/models.py:979
+#: common/models.py:1023
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:980
+#: common/models.py:1024
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:986
+#: common/models.py:1030
 msgid "Escape Key Closes Forms"
 msgstr ""
 
-#: common/models.py:987
+#: common/models.py:1031
 msgid "Use the escape key to close modal forms"
 msgstr ""
 
-#: common/models.py:1044 company/forms.py:43
+#: common/models.py:1088 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:1051 company/templates/company/supplier_part.html:231
+#: common/models.py:1095 company/templates/company/supplier_part.html:231
 #: templates/js/translated/part.js:1369
 msgid "Price"
 msgstr ""
 
-#: common/models.py:1052
+#: common/models.py:1096
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1145
+#: common/models.py:1189
 msgid "Default"
 msgstr ""
 
@@ -2593,8 +2662,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:82
 #: part/templates/part/navbar.html:85 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:229
-#: templates/InvenTree/settings/navbar.html:113
-#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:119
+#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:44
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2617,8 +2686,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:91
 #: part/templates/part/navbar.html:94 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:249
-#: templates/InvenTree/settings/navbar.html:119
-#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:55
+#: templates/InvenTree/settings/navbar.html:125
+#: templates/InvenTree/settings/navbar.html:127 templates/navbar.html:55
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2704,7 +2773,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part.html:239
 #: part/templates/part/detail.html:214 part/templates/part/detail.html:294
 #: part/templates/part/detail.html:317 templates/js/translated/company.js:424
-#: templates/js/translated/helpers.js:31 users/models.py:194
+#: templates/js/translated/helpers.js:31 users/models.py:199
 msgid "Delete"
 msgstr ""
 
@@ -2753,8 +2822,8 @@ msgstr ""
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:182
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109
 #: templates/js/translated/part.js:540 templates/js/translated/part.js:769
 #: templates/js/translated/part.js:945 templates/js/translated/stock.js:182
 #: templates/js/translated/stock.js:829 templates/navbar.html:32
@@ -3712,8 +3781,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
 #: templates/js/translated/part.js:1165 templates/navbar.html:29
 #: templates/stats.html:80 templates/stats.html:89 users/models.py:41
 msgid "Parts"
@@ -3927,7 +3996,7 @@ msgstr ""
 
 #: part/models.py:696 part/models.py:2299
 #: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:168
+#: templates/InvenTree/settings/settings.html:169
 #: templates/js/translated/part.js:927
 msgid "Category"
 msgstr ""
@@ -4117,7 +4186,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2256 part/models.py:2305 part/models.py:2306
-#: templates/InvenTree/settings/settings.html:163
+#: templates/InvenTree/settings/settings.html:164
 msgid "Parameter Template"
 msgstr ""
 
@@ -4129,7 +4198,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2310 templates/InvenTree/settings/settings.html:172
+#: part/models.py:2310 templates/InvenTree/settings/settings.html:173
 msgid "Default Value"
 msgstr ""
 
@@ -6143,6 +6212,14 @@ msgstr ""
 msgid "Setting"
 msgstr ""
 
+#: templates/InvenTree/settings/login.html:9
+msgid "Login Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/login.html:22 templates/account/signup.html:5
+msgid "Signup"
+msgstr ""
+
 #: templates/InvenTree/settings/navbar.html:12
 #: templates/InvenTree/settings/user_settings.html:9
 msgid "User Settings"
@@ -6196,22 +6273,27 @@ msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
-msgid "Barcodes"
+#: templates/InvenTree/settings/navbar.html:73 templates/navbar.html:87
+msgid "Login"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:77
 #: templates/InvenTree/settings/navbar.html:79
-msgid "Currencies"
+msgid "Barcodes"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:83
 #: templates/InvenTree/settings/navbar.html:85
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
 msgid "Reporting"
 msgstr ""
 
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103
 msgid "Categories"
 msgstr ""
 
@@ -6252,21 +6334,21 @@ msgstr ""
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:153
+#: templates/InvenTree/settings/settings.html:154
 msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:175
-#: templates/InvenTree/settings/settings.html:274
-msgid "Edit Template"
-msgstr ""
-
 #: templates/InvenTree/settings/settings.html:176
 #: templates/InvenTree/settings/settings.html:275
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/settings.html:177
+#: templates/InvenTree/settings/settings.html:276
 msgid "Delete Template"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:254
+#: templates/InvenTree/settings/settings.html:255
 msgid "No part parameter templates found"
 msgstr ""
 
@@ -6278,70 +6360,136 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:9
+#: templates/InvenTree/settings/user.html:11
 msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:15
+#: templates/InvenTree/settings/user.html:19
 #: templates/js/translated/helpers.js:26
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:17
+#: templates/InvenTree/settings/user.html:21
+#: templates/account/password_reset_from_key.html:4
+#: templates/account/password_reset_from_key.html:7
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:24
-#: templates/registration/login.html:58
+#: templates/InvenTree/settings/user.html:28
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:32
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:36
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
-msgid "Email Address"
+#: templates/InvenTree/settings/user.html:42
+msgid "E-Mail"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:42
-msgid "Theme Settings"
+#: templates/InvenTree/settings/user.html:47
+msgid "The following e-mail addresses are associated with your account:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:61
+msgid "Verified"
 msgstr ""
 
 #: templates/InvenTree/settings/user.html:63
+msgid "Unverified"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:65
+msgid "Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:71
+msgid "Make Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:72
+msgid "Re-send Verification"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:73
+#: templates/InvenTree/settings/user.html:130
+msgid "Remove"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:80
+msgid "Warning:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:81
+msgid "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."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:88
+msgid "Add E-mail Address"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:93
+msgid "Add E-mail"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:100
+msgid "Social Accounts"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:105
+msgid "You can sign in to your account using any of the following third party accounts:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:138
+msgid "You currently have no social network accounts connected to this account."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:142
+msgid "Add a 3rd Party Account"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:153
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:174
 msgid "Set Theme"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:70
+#: templates/InvenTree/settings/user.html:181
 msgid "Language Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:89
+#: templates/InvenTree/settings/user.html:200
 #, python-format
 msgid "%(lang_translated)s%% translated"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:91
+#: templates/InvenTree/settings/user.html:202
 msgid "No translations available"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:98
+#: templates/InvenTree/settings/user.html:209
 msgid "Set Language"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:103
+#: templates/InvenTree/settings/user.html:214
 msgid "Help the translation efforts!"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:104
+#: templates/InvenTree/settings/user.html:215
 #, python-format
 msgid "Native language translation of the InvenTree web application is <a href=\"%(link)s\">community contributed via crowdin</a>. Contributions are welcomed and encouraged."
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:223
+msgid "Do you really want to remove the selected e-mail address?"
+msgstr ""
+
 #: templates/InvenTree/settings/user_forms.html:9
 msgid "Form Settings"
 msgstr ""
@@ -6433,6 +6581,105 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#: templates/account/email_confirm.html:6
+#: templates/account/email_confirm.html:10
+msgid "Confirm E-mail Address"
+msgstr ""
+
+#: templates/account/email_confirm.html:16
+#, python-format
+msgid "Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail address for user %(user_display)s."
+msgstr ""
+
+#: templates/account/email_confirm.html:27
+#, python-format
+msgid "This e-mail confirmation link expired or is invalid. Please <a href=\"%(email_url)s\">issue a new e-mail confirmation request</a>."
+msgstr ""
+
+#: templates/account/login.html:5 templates/account/login.html:14
+#: templates/account/login.html:36
+msgid "Sign In"
+msgstr ""
+
+#: templates/account/login.html:19
+#, python-format
+msgid ""
+"Please sign in with one\n"
+"of your existing third party accounts or  <a class=\"btn btn-primary btn-small\" href=\"%(signup_url)s\">sign up</a>\n"
+"for a account and sign in below:"
+msgstr ""
+
+#: templates/account/login.html:23
+#, python-format
+msgid ""
+"If you have not created an account yet, then please\n"
+"<a href=\"%(signup_url)s\">sign up</a> first."
+msgstr ""
+
+#: templates/account/login.html:38
+msgid "Forgot Password?"
+msgstr ""
+
+#: templates/account/login.html:45
+msgid "or use SSO"
+msgstr ""
+
+#: templates/account/logout.html:5 templates/account/logout.html:8
+#: templates/account/logout.html:17
+msgid "Sign Out"
+msgstr ""
+
+#: templates/account/logout.html:10
+msgid "Are you sure you want to sign out?"
+msgstr ""
+
+#: templates/account/password_reset.html:5
+#: templates/account/password_reset.html:12
+msgid "Password Reset"
+msgstr ""
+
+#: templates/account/password_reset.html:18
+msgid "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it."
+msgstr ""
+
+#: templates/account/password_reset.html:23
+msgid "Reset My Password"
+msgstr ""
+
+#: templates/account/password_reset.html:27 templates/account/signup.html:36
+msgid "This function is currently disabled. Please contact an administrator."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:7
+msgid "Bad Token"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:11
+#, python-format
+msgid "The password reset link was invalid, possibly because it has already been used.  Please request a <a href=\"%(passwd_reset_url)s\">new password reset</a>."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:17
+msgid "change password"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:20
+msgid "Your password is now changed."
+msgstr ""
+
+#: templates/account/signup.html:11 templates/account/signup.html:22
+msgid "Sign Up"
+msgstr ""
+
+#: templates/account/signup.html:13
+#, python-format
+msgid "Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>."
+msgstr ""
+
+#: templates/account/signup.html:27
+msgid "Or use a SSO-provider for signup"
+msgstr ""
+
 #: templates/image_download.html:8
 msgid "Specify URL for downloading image"
 msgstr ""
@@ -7566,7 +7813,7 @@ msgstr ""
 msgid "Add Stock"
 msgstr ""
 
-#: templates/js/translated/stock.js:165 users/models.py:190
+#: templates/js/translated/stock.js:165 users/models.py:195
 msgid "Add"
 msgstr ""
 
@@ -8023,10 +8270,6 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: templates/navbar.html:87 templates/registration/login.html:89
-msgid "Login"
-msgstr ""
-
 #: templates/navbar.html:106
 msgid "About InvenTree"
 msgstr ""
@@ -8035,68 +8278,12 @@ msgstr ""
 msgid "QR data not provided"
 msgstr ""
 
-#: templates/registration/logged_out.html:50
-msgid "You have been logged out"
+#: templates/registration/logged_out.html:6
+msgid "You were logged out successfully."
 msgstr ""
 
-#: templates/registration/logged_out.html:51
-#: templates/registration/password_reset_complete.html:51
-#: templates/registration/password_reset_done.html:58
-msgid "Return to login screen"
-msgstr ""
-
-#: templates/registration/login.html:64
-msgid "Enter username"
-msgstr ""
-
-#: templates/registration/login.html:70
-msgid "Password"
-msgstr ""
-
-#: templates/registration/login.html:83
-msgid "Username / password combination is incorrect"
-msgstr ""
-
-#: templates/registration/login.html:95
-#: templates/registration/password_reset_form.html:51
-msgid "Forgotten your password?"
-msgstr ""
-
-#: templates/registration/login.html:95
-msgid "Click here to reset"
-msgstr ""
-
-#: templates/registration/password_reset_complete.html:50
-msgid "Password reset complete"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:52
-#: templates/registration/password_reset_confirm.html:56
-msgid "Change password"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:60
-msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:51
-msgid "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:54
-msgid "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:52
-msgid "Enter your email address below."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:53
-msgid "An email will be sent with password reset instructions."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:58
-msgid "Send email"
+#: templates/registration/logged_out.html:8
+msgid "Log in again"
 msgstr ""
 
 #: templates/stats.html:13
@@ -8235,34 +8422,34 @@ msgstr ""
 msgid "Important dates"
 msgstr ""
 
-#: users/models.py:177
+#: users/models.py:182
 msgid "Permission set"
 msgstr ""
 
-#: users/models.py:185
+#: users/models.py:190
 msgid "Group"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "View"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "Permission to view items"
 msgstr ""
 
-#: users/models.py:190
+#: users/models.py:195
 msgid "Permission to add items"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Change"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Permissions to edit items"
 msgstr ""
 
-#: users/models.py:194
+#: users/models.py:199
 msgid "Permission to delete items"
 msgstr ""
diff --git a/InvenTree/locale/id/LC_MESSAGES/django.po b/InvenTree/locale/id/LC_MESSAGES/django.po
index e0899a6e15..342901e392 100644
--- a/InvenTree/locale/id/LC_MESSAGES/django.po
+++ b/InvenTree/locale/id/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-11 01:01+0000\n"
+"POT-Creation-Date: 2021-10-11 06:21+0000\n"
 "PO-Revision-Date: 2021-09-12 13:44\n"
 "Last-Translator: \n"
 "Language-Team: Indonesian\n"
@@ -33,41 +33,54 @@ msgstr ""
 msgid "Enter date"
 msgstr ""
 
-#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:116 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:173 build/forms.py:215 order/forms.py:27
 #: order/forms.py:38 order/forms.py:49 order/forms.py:60 order/forms.py:71
-#: part/forms.py:108 templates/js/translated/forms.js:564
+#: part/forms.py:108 templates/account/email_confirm.html:20
+#: templates/js/translated/forms.js:564
 msgid "Confirm"
 msgstr ""
 
-#: InvenTree/forms.py:127
+#: InvenTree/forms.py:132
 msgid "Confirm delete"
 msgstr ""
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:133
 msgid "Confirm item deletion"
 msgstr ""
 
-#: InvenTree/forms.py:160 templates/registration/login.html:76
+#: InvenTree/forms.py:164
 msgid "Enter password"
 msgstr ""
 
-#: InvenTree/forms.py:161
+#: InvenTree/forms.py:165
 msgid "Enter new password"
 msgstr ""
 
-#: InvenTree/forms.py:168
+#: InvenTree/forms.py:172
 msgid "Confirm password"
 msgstr ""
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:173
 msgid "Confirm new password"
 msgstr ""
 
-#: InvenTree/forms.py:201
+#: InvenTree/forms.py:205
 msgid "Select Category"
 msgstr ""
 
+#: InvenTree/forms.py:226
+msgid "E-mail (again)"
+msgstr ""
+
+#: InvenTree/forms.py:230
+msgid "E-mail address confirmation"
+msgstr ""
+
+#: InvenTree/forms.py:250
+msgid "You must type the same email each time."
+msgstr ""
+
 #: InvenTree/helpers.py:401
 #, python-brace-format
 msgid "Duplicate serial: {n}"
@@ -118,8 +131,8 @@ msgstr ""
 msgid "File comment"
 msgstr ""
 
-#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1011
-#: common/models.py:1012 part/models.py:2055
+#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1055
+#: common/models.py:1056 part/models.py:2055
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/translated/stock.js:1669
 msgid "User"
@@ -205,75 +218,75 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: InvenTree/settings.py:523
+#: InvenTree/settings.py:529
 msgid "German"
 msgstr ""
 
-#: InvenTree/settings.py:524
+#: InvenTree/settings.py:530
 msgid "Greek"
 msgstr ""
 
-#: InvenTree/settings.py:525
+#: InvenTree/settings.py:531
 msgid "English"
 msgstr ""
 
-#: InvenTree/settings.py:526
+#: InvenTree/settings.py:532
 msgid "Spanish"
 msgstr ""
 
-#: InvenTree/settings.py:527
+#: InvenTree/settings.py:533
 msgid "French"
 msgstr ""
 
-#: InvenTree/settings.py:528
+#: InvenTree/settings.py:534
 msgid "Hebrew"
 msgstr ""
 
-#: InvenTree/settings.py:529
+#: InvenTree/settings.py:535
 msgid "Italian"
 msgstr ""
 
-#: InvenTree/settings.py:530
+#: InvenTree/settings.py:536
 msgid "Japanese"
 msgstr ""
 
-#: InvenTree/settings.py:531
+#: InvenTree/settings.py:537
 msgid "Korean"
 msgstr ""
 
-#: InvenTree/settings.py:532
+#: InvenTree/settings.py:538
 msgid "Dutch"
 msgstr ""
 
-#: InvenTree/settings.py:533
+#: InvenTree/settings.py:539
 msgid "Norwegian"
 msgstr ""
 
-#: InvenTree/settings.py:534
+#: InvenTree/settings.py:540
 msgid "Polish"
 msgstr ""
 
-#: InvenTree/settings.py:535
+#: InvenTree/settings.py:541
 msgid "Russian"
 msgstr ""
 
-#: InvenTree/settings.py:536
+#: InvenTree/settings.py:542
 msgid "Swedish"
 msgstr ""
 
-#: InvenTree/settings.py:537
+#: InvenTree/settings.py:543
 msgid "Thai"
 msgstr ""
 
-#: InvenTree/settings.py:538
+#: InvenTree/settings.py:544
 msgid "Turkish"
 msgstr ""
 
-#: InvenTree/settings.py:539
+#: InvenTree/settings.py:545
 msgid "Vietnamese"
 msgstr ""
 
-#: InvenTree/settings.py:540
+#: InvenTree/settings.py:546
 msgid "Chinese"
 msgstr ""
 
@@ -458,27 +471,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:610
+#: InvenTree/views.py:616
 msgid "Delete Item"
 msgstr ""
 
-#: InvenTree/views.py:659
+#: InvenTree/views.py:665
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:674 templates/InvenTree/settings/user.html:14
+#: InvenTree/views.py:680 templates/InvenTree/settings/user.html:18
 msgid "Edit User Information"
 msgstr ""
 
-#: InvenTree/views.py:685 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:691 templates/InvenTree/settings/user.html:22
 msgid "Set Password"
 msgstr ""
 
-#: InvenTree/views.py:704
+#: InvenTree/views.py:710
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:910 templates/navbar.html:97
+#: InvenTree/views.py:954 templates/navbar.html:97
 msgid "System Information"
 msgstr ""
 
@@ -551,7 +564,7 @@ msgstr ""
 #: build/forms.py:48 build/forms.py:90 build/models.py:1281
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:1043
+#: build/templates/build/detail.html:34 common/models.py:1087
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:101 order/forms.py:123 order/models.py:720
 #: order/models.py:982 order/templates/order/order_wizard/match_parts.html:30
@@ -681,8 +694,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:50
 #: part/templates/part/navbar.html:53 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:171
-#: templates/InvenTree/settings/navbar.html:107
-#: templates/InvenTree/settings/navbar.html:109 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1541,7 +1554,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:308 common/models.py:843 common/models.py:1004
+#: common/models.py:308 common/models.py:887 common/models.py:1048
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1955,196 +1968,252 @@ msgstr ""
 msgid "Enable PO functionality in InvenTree interface"
 msgstr ""
 
+#: common/models.py:836
+msgid "Enable password forgot"
+msgstr ""
+
+#: common/models.py:837
+msgid "Enable password forgot function on the login-pages"
+msgstr ""
+
+#: common/models.py:842
+msgid "Enable registration"
+msgstr ""
+
+#: common/models.py:843
+msgid "Enable self-registration for users on the login-pages"
+msgstr ""
+
+#: common/models.py:848
+msgid "Enable SSO"
+msgstr ""
+
+#: common/models.py:849
+msgid "Enable SSO on the login-pages"
+msgstr ""
+
 #: common/models.py:854
-msgid "Show starred parts"
+msgid "E-Mail required"
 msgstr ""
 
 #: common/models.py:855
-msgid "Show starred parts on the homepage"
+msgid "Require user to supply mail on signup"
 msgstr ""
 
 #: common/models.py:860
-msgid "Show latest parts"
+msgid "Auto-fill SSO users"
 msgstr ""
 
 #: common/models.py:861
-msgid "Show latest parts on the homepage"
+msgid "Automatically fill out user-details from SSO account-data"
 msgstr ""
 
 #: common/models.py:866
-msgid "Recent Part Count"
+msgid "Mail twice"
 msgstr ""
 
 #: common/models.py:867
-msgid "Number of recent parts to display on index page"
+msgid "On signup ask users twice for their mail"
+msgstr ""
+
+#: common/models.py:872
+msgid "Password twice"
 msgstr ""
 
 #: common/models.py:873
-msgid "Show unvalidated BOMs"
-msgstr ""
-
-#: common/models.py:874
-msgid "Show BOMs that await validation on the homepage"
-msgstr ""
-
-#: common/models.py:879
-msgid "Show recent stock changes"
-msgstr ""
-
-#: common/models.py:880
-msgid "Show recently changed stock items on the homepage"
-msgstr ""
-
-#: common/models.py:885
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:886
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:891
-msgid "Show low stock"
-msgstr ""
-
-#: common/models.py:892
-msgid "Show low stock items on the homepage"
-msgstr ""
-
-#: common/models.py:897
-msgid "Show depleted stock"
+msgid "On signup ask users twice for their password"
 msgstr ""
 
 #: common/models.py:898
-msgid "Show depleted stock items on the homepage"
+msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:903
-msgid "Show needed stock"
+#: common/models.py:899
+msgid "Show starred parts on the homepage"
 msgstr ""
 
 #: common/models.py:904
-msgid "Show stock items needed for builds on the homepage"
+msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:909
-msgid "Show expired stock"
+#: common/models.py:905
+msgid "Show latest parts on the homepage"
 msgstr ""
 
 #: common/models.py:910
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:911
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:917
+msgid "Show unvalidated BOMs"
+msgstr ""
+
+#: common/models.py:918
+msgid "Show BOMs that await validation on the homepage"
+msgstr ""
+
+#: common/models.py:923
+msgid "Show recent stock changes"
+msgstr ""
+
+#: common/models.py:924
+msgid "Show recently changed stock items on the homepage"
+msgstr ""
+
+#: common/models.py:929
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:930
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:935
+msgid "Show low stock"
+msgstr ""
+
+#: common/models.py:936
+msgid "Show low stock items on the homepage"
+msgstr ""
+
+#: common/models.py:941
+msgid "Show depleted stock"
+msgstr ""
+
+#: common/models.py:942
+msgid "Show depleted stock items on the homepage"
+msgstr ""
+
+#: common/models.py:947
+msgid "Show needed stock"
+msgstr ""
+
+#: common/models.py:948
+msgid "Show stock items needed for builds on the homepage"
+msgstr ""
+
+#: common/models.py:953
+msgid "Show expired stock"
+msgstr ""
+
+#: common/models.py:954
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:915
+#: common/models.py:959
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:916
+#: common/models.py:960
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:921
+#: common/models.py:965
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:922
+#: common/models.py:966
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:927
+#: common/models.py:971
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:928
+#: common/models.py:972
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:933
+#: common/models.py:977
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:934
+#: common/models.py:978
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:939
+#: common/models.py:983
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:940
+#: common/models.py:984
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:945
+#: common/models.py:989
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:946
+#: common/models.py:990
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:951
+#: common/models.py:995
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:952
+#: common/models.py:996
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:958
+#: common/models.py:1002
 msgid "Inline label display"
 msgstr ""
 
-#: common/models.py:959
+#: common/models.py:1003
 msgid "Display PDF labels in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:965
+#: common/models.py:1009
 msgid "Inline report display"
 msgstr ""
 
-#: common/models.py:966
+#: common/models.py:1010
 msgid "Display PDF reports in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:972
+#: common/models.py:1016
 msgid "Search Preview Results"
 msgstr ""
 
-#: common/models.py:973
+#: common/models.py:1017
 msgid "Number of results to show in search preview window"
 msgstr ""
 
-#: common/models.py:979
+#: common/models.py:1023
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:980
+#: common/models.py:1024
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:986
+#: common/models.py:1030
 msgid "Escape Key Closes Forms"
 msgstr ""
 
-#: common/models.py:987
+#: common/models.py:1031
 msgid "Use the escape key to close modal forms"
 msgstr ""
 
-#: common/models.py:1044 company/forms.py:43
+#: common/models.py:1088 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:1051 company/templates/company/supplier_part.html:231
+#: common/models.py:1095 company/templates/company/supplier_part.html:231
 #: templates/js/translated/part.js:1369
 msgid "Price"
 msgstr ""
 
-#: common/models.py:1052
+#: common/models.py:1096
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1145
+#: common/models.py:1189
 msgid "Default"
 msgstr ""
 
@@ -2593,8 +2662,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:82
 #: part/templates/part/navbar.html:85 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:229
-#: templates/InvenTree/settings/navbar.html:113
-#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:119
+#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:44
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2617,8 +2686,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:91
 #: part/templates/part/navbar.html:94 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:249
-#: templates/InvenTree/settings/navbar.html:119
-#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:55
+#: templates/InvenTree/settings/navbar.html:125
+#: templates/InvenTree/settings/navbar.html:127 templates/navbar.html:55
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2704,7 +2773,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part.html:239
 #: part/templates/part/detail.html:214 part/templates/part/detail.html:294
 #: part/templates/part/detail.html:317 templates/js/translated/company.js:424
-#: templates/js/translated/helpers.js:31 users/models.py:194
+#: templates/js/translated/helpers.js:31 users/models.py:199
 msgid "Delete"
 msgstr ""
 
@@ -2753,8 +2822,8 @@ msgstr ""
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:182
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109
 #: templates/js/translated/part.js:540 templates/js/translated/part.js:769
 #: templates/js/translated/part.js:945 templates/js/translated/stock.js:182
 #: templates/js/translated/stock.js:829 templates/navbar.html:32
@@ -3712,8 +3781,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
 #: templates/js/translated/part.js:1165 templates/navbar.html:29
 #: templates/stats.html:80 templates/stats.html:89 users/models.py:41
 msgid "Parts"
@@ -3927,7 +3996,7 @@ msgstr ""
 
 #: part/models.py:696 part/models.py:2299
 #: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:168
+#: templates/InvenTree/settings/settings.html:169
 #: templates/js/translated/part.js:927
 msgid "Category"
 msgstr ""
@@ -4117,7 +4186,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2256 part/models.py:2305 part/models.py:2306
-#: templates/InvenTree/settings/settings.html:163
+#: templates/InvenTree/settings/settings.html:164
 msgid "Parameter Template"
 msgstr ""
 
@@ -4129,7 +4198,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2310 templates/InvenTree/settings/settings.html:172
+#: part/models.py:2310 templates/InvenTree/settings/settings.html:173
 msgid "Default Value"
 msgstr ""
 
@@ -6143,6 +6212,14 @@ msgstr ""
 msgid "Setting"
 msgstr ""
 
+#: templates/InvenTree/settings/login.html:9
+msgid "Login Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/login.html:22 templates/account/signup.html:5
+msgid "Signup"
+msgstr ""
+
 #: templates/InvenTree/settings/navbar.html:12
 #: templates/InvenTree/settings/user_settings.html:9
 msgid "User Settings"
@@ -6196,22 +6273,27 @@ msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
-msgid "Barcodes"
+#: templates/InvenTree/settings/navbar.html:73 templates/navbar.html:87
+msgid "Login"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:77
 #: templates/InvenTree/settings/navbar.html:79
-msgid "Currencies"
+msgid "Barcodes"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:83
 #: templates/InvenTree/settings/navbar.html:85
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
 msgid "Reporting"
 msgstr ""
 
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103
 msgid "Categories"
 msgstr ""
 
@@ -6252,21 +6334,21 @@ msgstr ""
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:153
+#: templates/InvenTree/settings/settings.html:154
 msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:175
-#: templates/InvenTree/settings/settings.html:274
-msgid "Edit Template"
-msgstr ""
-
 #: templates/InvenTree/settings/settings.html:176
 #: templates/InvenTree/settings/settings.html:275
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/settings.html:177
+#: templates/InvenTree/settings/settings.html:276
 msgid "Delete Template"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:254
+#: templates/InvenTree/settings/settings.html:255
 msgid "No part parameter templates found"
 msgstr ""
 
@@ -6278,70 +6360,136 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:9
+#: templates/InvenTree/settings/user.html:11
 msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:15
+#: templates/InvenTree/settings/user.html:19
 #: templates/js/translated/helpers.js:26
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:17
+#: templates/InvenTree/settings/user.html:21
+#: templates/account/password_reset_from_key.html:4
+#: templates/account/password_reset_from_key.html:7
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:24
-#: templates/registration/login.html:58
+#: templates/InvenTree/settings/user.html:28
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:32
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:36
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
-msgid "Email Address"
+#: templates/InvenTree/settings/user.html:42
+msgid "E-Mail"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:42
-msgid "Theme Settings"
+#: templates/InvenTree/settings/user.html:47
+msgid "The following e-mail addresses are associated with your account:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:61
+msgid "Verified"
 msgstr ""
 
 #: templates/InvenTree/settings/user.html:63
+msgid "Unverified"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:65
+msgid "Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:71
+msgid "Make Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:72
+msgid "Re-send Verification"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:73
+#: templates/InvenTree/settings/user.html:130
+msgid "Remove"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:80
+msgid "Warning:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:81
+msgid "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."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:88
+msgid "Add E-mail Address"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:93
+msgid "Add E-mail"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:100
+msgid "Social Accounts"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:105
+msgid "You can sign in to your account using any of the following third party accounts:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:138
+msgid "You currently have no social network accounts connected to this account."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:142
+msgid "Add a 3rd Party Account"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:153
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:174
 msgid "Set Theme"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:70
+#: templates/InvenTree/settings/user.html:181
 msgid "Language Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:89
+#: templates/InvenTree/settings/user.html:200
 #, python-format
 msgid "%(lang_translated)s%% translated"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:91
+#: templates/InvenTree/settings/user.html:202
 msgid "No translations available"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:98
+#: templates/InvenTree/settings/user.html:209
 msgid "Set Language"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:103
+#: templates/InvenTree/settings/user.html:214
 msgid "Help the translation efforts!"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:104
+#: templates/InvenTree/settings/user.html:215
 #, python-format
 msgid "Native language translation of the InvenTree web application is <a href=\"%(link)s\">community contributed via crowdin</a>. Contributions are welcomed and encouraged."
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:223
+msgid "Do you really want to remove the selected e-mail address?"
+msgstr ""
+
 #: templates/InvenTree/settings/user_forms.html:9
 msgid "Form Settings"
 msgstr ""
@@ -6433,6 +6581,105 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#: templates/account/email_confirm.html:6
+#: templates/account/email_confirm.html:10
+msgid "Confirm E-mail Address"
+msgstr ""
+
+#: templates/account/email_confirm.html:16
+#, python-format
+msgid "Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail address for user %(user_display)s."
+msgstr ""
+
+#: templates/account/email_confirm.html:27
+#, python-format
+msgid "This e-mail confirmation link expired or is invalid. Please <a href=\"%(email_url)s\">issue a new e-mail confirmation request</a>."
+msgstr ""
+
+#: templates/account/login.html:5 templates/account/login.html:14
+#: templates/account/login.html:36
+msgid "Sign In"
+msgstr ""
+
+#: templates/account/login.html:19
+#, python-format
+msgid ""
+"Please sign in with one\n"
+"of your existing third party accounts or  <a class=\"btn btn-primary btn-small\" href=\"%(signup_url)s\">sign up</a>\n"
+"for a account and sign in below:"
+msgstr ""
+
+#: templates/account/login.html:23
+#, python-format
+msgid ""
+"If you have not created an account yet, then please\n"
+"<a href=\"%(signup_url)s\">sign up</a> first."
+msgstr ""
+
+#: templates/account/login.html:38
+msgid "Forgot Password?"
+msgstr ""
+
+#: templates/account/login.html:45
+msgid "or use SSO"
+msgstr ""
+
+#: templates/account/logout.html:5 templates/account/logout.html:8
+#: templates/account/logout.html:17
+msgid "Sign Out"
+msgstr ""
+
+#: templates/account/logout.html:10
+msgid "Are you sure you want to sign out?"
+msgstr ""
+
+#: templates/account/password_reset.html:5
+#: templates/account/password_reset.html:12
+msgid "Password Reset"
+msgstr ""
+
+#: templates/account/password_reset.html:18
+msgid "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it."
+msgstr ""
+
+#: templates/account/password_reset.html:23
+msgid "Reset My Password"
+msgstr ""
+
+#: templates/account/password_reset.html:27 templates/account/signup.html:36
+msgid "This function is currently disabled. Please contact an administrator."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:7
+msgid "Bad Token"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:11
+#, python-format
+msgid "The password reset link was invalid, possibly because it has already been used.  Please request a <a href=\"%(passwd_reset_url)s\">new password reset</a>."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:17
+msgid "change password"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:20
+msgid "Your password is now changed."
+msgstr ""
+
+#: templates/account/signup.html:11 templates/account/signup.html:22
+msgid "Sign Up"
+msgstr ""
+
+#: templates/account/signup.html:13
+#, python-format
+msgid "Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>."
+msgstr ""
+
+#: templates/account/signup.html:27
+msgid "Or use a SSO-provider for signup"
+msgstr ""
+
 #: templates/image_download.html:8
 msgid "Specify URL for downloading image"
 msgstr ""
@@ -7566,7 +7813,7 @@ msgstr ""
 msgid "Add Stock"
 msgstr ""
 
-#: templates/js/translated/stock.js:165 users/models.py:190
+#: templates/js/translated/stock.js:165 users/models.py:195
 msgid "Add"
 msgstr ""
 
@@ -8023,10 +8270,6 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: templates/navbar.html:87 templates/registration/login.html:89
-msgid "Login"
-msgstr ""
-
 #: templates/navbar.html:106
 msgid "About InvenTree"
 msgstr ""
@@ -8035,68 +8278,12 @@ msgstr ""
 msgid "QR data not provided"
 msgstr ""
 
-#: templates/registration/logged_out.html:50
-msgid "You have been logged out"
+#: templates/registration/logged_out.html:6
+msgid "You were logged out successfully."
 msgstr ""
 
-#: templates/registration/logged_out.html:51
-#: templates/registration/password_reset_complete.html:51
-#: templates/registration/password_reset_done.html:58
-msgid "Return to login screen"
-msgstr ""
-
-#: templates/registration/login.html:64
-msgid "Enter username"
-msgstr ""
-
-#: templates/registration/login.html:70
-msgid "Password"
-msgstr ""
-
-#: templates/registration/login.html:83
-msgid "Username / password combination is incorrect"
-msgstr ""
-
-#: templates/registration/login.html:95
-#: templates/registration/password_reset_form.html:51
-msgid "Forgotten your password?"
-msgstr ""
-
-#: templates/registration/login.html:95
-msgid "Click here to reset"
-msgstr ""
-
-#: templates/registration/password_reset_complete.html:50
-msgid "Password reset complete"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:52
-#: templates/registration/password_reset_confirm.html:56
-msgid "Change password"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:60
-msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:51
-msgid "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:54
-msgid "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:52
-msgid "Enter your email address below."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:53
-msgid "An email will be sent with password reset instructions."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:58
-msgid "Send email"
+#: templates/registration/logged_out.html:8
+msgid "Log in again"
 msgstr ""
 
 #: templates/stats.html:13
@@ -8235,34 +8422,34 @@ msgstr ""
 msgid "Important dates"
 msgstr ""
 
-#: users/models.py:177
+#: users/models.py:182
 msgid "Permission set"
 msgstr ""
 
-#: users/models.py:185
+#: users/models.py:190
 msgid "Group"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "View"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "Permission to view items"
 msgstr ""
 
-#: users/models.py:190
+#: users/models.py:195
 msgid "Permission to add items"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Change"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Permissions to edit items"
 msgstr ""
 
-#: users/models.py:194
+#: users/models.py:199
 msgid "Permission to delete items"
 msgstr ""
diff --git a/InvenTree/locale/it/LC_MESSAGES/django.po b/InvenTree/locale/it/LC_MESSAGES/django.po
index 810acb2742..bc6d4346e2 100644
--- a/InvenTree/locale/it/LC_MESSAGES/django.po
+++ b/InvenTree/locale/it/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-11 01:01+0000\n"
+"POT-Creation-Date: 2021-10-11 06:21+0000\n"
 "PO-Revision-Date: 2021-09-12 13:44\n"
 "Last-Translator: \n"
 "Language-Team: Italian\n"
@@ -33,41 +33,54 @@ msgstr "Nessuna azione corrispondente trovata"
 msgid "Enter date"
 msgstr "Inserisci la data"
 
-#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:116 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:173 build/forms.py:215 order/forms.py:27
 #: order/forms.py:38 order/forms.py:49 order/forms.py:60 order/forms.py:71
-#: part/forms.py:108 templates/js/translated/forms.js:564
+#: part/forms.py:108 templates/account/email_confirm.html:20
+#: templates/js/translated/forms.js:564
 msgid "Confirm"
 msgstr "Conferma"
 
-#: InvenTree/forms.py:127
+#: InvenTree/forms.py:132
 msgid "Confirm delete"
 msgstr ""
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:133
 msgid "Confirm item deletion"
 msgstr ""
 
-#: InvenTree/forms.py:160 templates/registration/login.html:76
+#: InvenTree/forms.py:164
 msgid "Enter password"
 msgstr "Inserire la password"
 
-#: InvenTree/forms.py:161
+#: InvenTree/forms.py:165
 msgid "Enter new password"
 msgstr "Inserire una nuova password"
 
-#: InvenTree/forms.py:168
+#: InvenTree/forms.py:172
 msgid "Confirm password"
 msgstr "Conferma la password"
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:173
 msgid "Confirm new password"
 msgstr "Conferma la nuova password"
 
-#: InvenTree/forms.py:201
+#: InvenTree/forms.py:205
 msgid "Select Category"
 msgstr "Selezione una categoria"
 
+#: InvenTree/forms.py:226
+msgid "E-mail (again)"
+msgstr ""
+
+#: InvenTree/forms.py:230
+msgid "E-mail address confirmation"
+msgstr ""
+
+#: InvenTree/forms.py:250
+msgid "You must type the same email each time."
+msgstr ""
+
 #: InvenTree/helpers.py:401
 #, python-brace-format
 msgid "Duplicate serial: {n}"
@@ -118,8 +131,8 @@ msgstr ""
 msgid "File comment"
 msgstr ""
 
-#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1011
-#: common/models.py:1012 part/models.py:2055
+#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1055
+#: common/models.py:1056 part/models.py:2055
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/translated/stock.js:1669
 msgid "User"
@@ -205,75 +218,75 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: InvenTree/settings.py:523
+#: InvenTree/settings.py:529
 msgid "German"
 msgstr "Tedesco"
 
-#: InvenTree/settings.py:524
+#: InvenTree/settings.py:530
 msgid "Greek"
 msgstr "Greco"
 
-#: InvenTree/settings.py:525
+#: InvenTree/settings.py:531
 msgid "English"
 msgstr "Inglese"
 
-#: InvenTree/settings.py:526
+#: InvenTree/settings.py:532
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: InvenTree/settings.py:527
+#: InvenTree/settings.py:533
 msgid "French"
 msgstr "Francese"
 
-#: InvenTree/settings.py:528
+#: InvenTree/settings.py:534
 msgid "Hebrew"
 msgstr "Ebraico"
 
-#: InvenTree/settings.py:529
+#: InvenTree/settings.py:535
 msgid "Italian"
 msgstr "Italiano"
 
-#: InvenTree/settings.py:530
+#: InvenTree/settings.py:536
 msgid "Japanese"
 msgstr "Giapponese"
 
-#: InvenTree/settings.py:531
+#: InvenTree/settings.py:537
 msgid "Korean"
 msgstr "Coreano"
 
-#: InvenTree/settings.py:532
+#: InvenTree/settings.py:538
 msgid "Dutch"
 msgstr "Olandese"
 
-#: InvenTree/settings.py:533
+#: InvenTree/settings.py:539
 msgid "Norwegian"
 msgstr "Norvegese"
 
-#: InvenTree/settings.py:534
+#: InvenTree/settings.py:540
 msgid "Polish"
 msgstr "Polacco"
 
-#: InvenTree/settings.py:535
+#: InvenTree/settings.py:541
 msgid "Russian"
 msgstr "Russo"
 
-#: InvenTree/settings.py:536
+#: InvenTree/settings.py:542
 msgid "Swedish"
 msgstr "Svedese"
 
-#: InvenTree/settings.py:537
+#: InvenTree/settings.py:543
 msgid "Thai"
 msgstr "Thailandese"
 
-#: InvenTree/settings.py:538
+#: InvenTree/settings.py:544
 msgid "Turkish"
 msgstr "Turco"
 
-#: InvenTree/settings.py:539
+#: InvenTree/settings.py:545
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: InvenTree/settings.py:540
+#: InvenTree/settings.py:546
 msgid "Chinese"
 msgstr "Cinese"
 
@@ -458,27 +471,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:610
+#: InvenTree/views.py:616
 msgid "Delete Item"
 msgstr ""
 
-#: InvenTree/views.py:659
+#: InvenTree/views.py:665
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:674 templates/InvenTree/settings/user.html:14
+#: InvenTree/views.py:680 templates/InvenTree/settings/user.html:18
 msgid "Edit User Information"
 msgstr ""
 
-#: InvenTree/views.py:685 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:691 templates/InvenTree/settings/user.html:22
 msgid "Set Password"
 msgstr ""
 
-#: InvenTree/views.py:704
+#: InvenTree/views.py:710
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:910 templates/navbar.html:97
+#: InvenTree/views.py:954 templates/navbar.html:97
 msgid "System Information"
 msgstr ""
 
@@ -551,7 +564,7 @@ msgstr ""
 #: build/forms.py:48 build/forms.py:90 build/models.py:1281
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:1043
+#: build/templates/build/detail.html:34 common/models.py:1087
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:101 order/forms.py:123 order/models.py:720
 #: order/models.py:982 order/templates/order/order_wizard/match_parts.html:30
@@ -681,8 +694,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:50
 #: part/templates/part/navbar.html:53 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:171
-#: templates/InvenTree/settings/navbar.html:107
-#: templates/InvenTree/settings/navbar.html:109 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1541,7 +1554,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:308 common/models.py:843 common/models.py:1004
+#: common/models.py:308 common/models.py:887 common/models.py:1048
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1955,196 +1968,254 @@ msgstr ""
 msgid "Enable PO functionality in InvenTree interface"
 msgstr ""
 
+#: common/models.py:836
+#, fuzzy
+#| msgid "Enter password"
+msgid "Enable password forgot"
+msgstr "Inserire la password"
+
+#: common/models.py:837
+msgid "Enable password forgot function on the login-pages"
+msgstr ""
+
+#: common/models.py:842
+msgid "Enable registration"
+msgstr ""
+
+#: common/models.py:843
+msgid "Enable self-registration for users on the login-pages"
+msgstr ""
+
+#: common/models.py:848
+msgid "Enable SSO"
+msgstr ""
+
+#: common/models.py:849
+msgid "Enable SSO on the login-pages"
+msgstr ""
+
 #: common/models.py:854
-msgid "Show starred parts"
+msgid "E-Mail required"
 msgstr ""
 
 #: common/models.py:855
-msgid "Show starred parts on the homepage"
+msgid "Require user to supply mail on signup"
 msgstr ""
 
 #: common/models.py:860
-msgid "Show latest parts"
+msgid "Auto-fill SSO users"
 msgstr ""
 
 #: common/models.py:861
-msgid "Show latest parts on the homepage"
+msgid "Automatically fill out user-details from SSO account-data"
 msgstr ""
 
 #: common/models.py:866
-msgid "Recent Part Count"
+msgid "Mail twice"
 msgstr ""
 
 #: common/models.py:867
-msgid "Number of recent parts to display on index page"
+msgid "On signup ask users twice for their mail"
+msgstr ""
+
+#: common/models.py:872
+msgid "Password twice"
 msgstr ""
 
 #: common/models.py:873
-msgid "Show unvalidated BOMs"
-msgstr ""
-
-#: common/models.py:874
-msgid "Show BOMs that await validation on the homepage"
-msgstr ""
-
-#: common/models.py:879
-msgid "Show recent stock changes"
-msgstr ""
-
-#: common/models.py:880
-msgid "Show recently changed stock items on the homepage"
-msgstr ""
-
-#: common/models.py:885
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:886
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:891
-msgid "Show low stock"
-msgstr ""
-
-#: common/models.py:892
-msgid "Show low stock items on the homepage"
-msgstr ""
-
-#: common/models.py:897
-msgid "Show depleted stock"
+msgid "On signup ask users twice for their password"
 msgstr ""
 
 #: common/models.py:898
-msgid "Show depleted stock items on the homepage"
+msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:903
-msgid "Show needed stock"
+#: common/models.py:899
+msgid "Show starred parts on the homepage"
 msgstr ""
 
 #: common/models.py:904
-msgid "Show stock items needed for builds on the homepage"
+msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:909
-msgid "Show expired stock"
+#: common/models.py:905
+msgid "Show latest parts on the homepage"
 msgstr ""
 
 #: common/models.py:910
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:911
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:917
+msgid "Show unvalidated BOMs"
+msgstr ""
+
+#: common/models.py:918
+msgid "Show BOMs that await validation on the homepage"
+msgstr ""
+
+#: common/models.py:923
+msgid "Show recent stock changes"
+msgstr ""
+
+#: common/models.py:924
+msgid "Show recently changed stock items on the homepage"
+msgstr ""
+
+#: common/models.py:929
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:930
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:935
+msgid "Show low stock"
+msgstr ""
+
+#: common/models.py:936
+msgid "Show low stock items on the homepage"
+msgstr ""
+
+#: common/models.py:941
+msgid "Show depleted stock"
+msgstr ""
+
+#: common/models.py:942
+msgid "Show depleted stock items on the homepage"
+msgstr ""
+
+#: common/models.py:947
+msgid "Show needed stock"
+msgstr ""
+
+#: common/models.py:948
+msgid "Show stock items needed for builds on the homepage"
+msgstr ""
+
+#: common/models.py:953
+msgid "Show expired stock"
+msgstr ""
+
+#: common/models.py:954
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:915
+#: common/models.py:959
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:916
+#: common/models.py:960
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:921
+#: common/models.py:965
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:922
+#: common/models.py:966
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:927
+#: common/models.py:971
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:928
+#: common/models.py:972
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:933
+#: common/models.py:977
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:934
+#: common/models.py:978
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:939
+#: common/models.py:983
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:940
+#: common/models.py:984
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:945
+#: common/models.py:989
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:946
+#: common/models.py:990
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:951
+#: common/models.py:995
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:952
+#: common/models.py:996
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:958
+#: common/models.py:1002
 msgid "Inline label display"
 msgstr ""
 
-#: common/models.py:959
+#: common/models.py:1003
 msgid "Display PDF labels in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:965
+#: common/models.py:1009
 msgid "Inline report display"
 msgstr ""
 
-#: common/models.py:966
+#: common/models.py:1010
 msgid "Display PDF reports in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:972
+#: common/models.py:1016
 msgid "Search Preview Results"
 msgstr ""
 
-#: common/models.py:973
+#: common/models.py:1017
 msgid "Number of results to show in search preview window"
 msgstr ""
 
-#: common/models.py:979
+#: common/models.py:1023
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:980
+#: common/models.py:1024
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:986
+#: common/models.py:1030
 msgid "Escape Key Closes Forms"
 msgstr ""
 
-#: common/models.py:987
+#: common/models.py:1031
 msgid "Use the escape key to close modal forms"
 msgstr ""
 
-#: common/models.py:1044 company/forms.py:43
+#: common/models.py:1088 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:1051 company/templates/company/supplier_part.html:231
+#: common/models.py:1095 company/templates/company/supplier_part.html:231
 #: templates/js/translated/part.js:1369
 msgid "Price"
 msgstr ""
 
-#: common/models.py:1052
+#: common/models.py:1096
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1145
+#: common/models.py:1189
 msgid "Default"
 msgstr ""
 
@@ -2593,8 +2664,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:82
 #: part/templates/part/navbar.html:85 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:229
-#: templates/InvenTree/settings/navbar.html:113
-#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:119
+#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:44
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2617,8 +2688,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:91
 #: part/templates/part/navbar.html:94 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:249
-#: templates/InvenTree/settings/navbar.html:119
-#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:55
+#: templates/InvenTree/settings/navbar.html:125
+#: templates/InvenTree/settings/navbar.html:127 templates/navbar.html:55
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2704,7 +2775,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part.html:239
 #: part/templates/part/detail.html:214 part/templates/part/detail.html:294
 #: part/templates/part/detail.html:317 templates/js/translated/company.js:424
-#: templates/js/translated/helpers.js:31 users/models.py:194
+#: templates/js/translated/helpers.js:31 users/models.py:199
 msgid "Delete"
 msgstr ""
 
@@ -2753,8 +2824,8 @@ msgstr ""
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:182
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109
 #: templates/js/translated/part.js:540 templates/js/translated/part.js:769
 #: templates/js/translated/part.js:945 templates/js/translated/stock.js:182
 #: templates/js/translated/stock.js:829 templates/navbar.html:32
@@ -3712,8 +3783,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
 #: templates/js/translated/part.js:1165 templates/navbar.html:29
 #: templates/stats.html:80 templates/stats.html:89 users/models.py:41
 msgid "Parts"
@@ -3927,7 +3998,7 @@ msgstr ""
 
 #: part/models.py:696 part/models.py:2299
 #: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:168
+#: templates/InvenTree/settings/settings.html:169
 #: templates/js/translated/part.js:927
 msgid "Category"
 msgstr ""
@@ -4117,7 +4188,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2256 part/models.py:2305 part/models.py:2306
-#: templates/InvenTree/settings/settings.html:163
+#: templates/InvenTree/settings/settings.html:164
 msgid "Parameter Template"
 msgstr ""
 
@@ -4129,7 +4200,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2310 templates/InvenTree/settings/settings.html:172
+#: part/models.py:2310 templates/InvenTree/settings/settings.html:173
 msgid "Default Value"
 msgstr ""
 
@@ -6145,6 +6216,14 @@ msgstr ""
 msgid "Setting"
 msgstr ""
 
+#: templates/InvenTree/settings/login.html:9
+msgid "Login Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/login.html:22 templates/account/signup.html:5
+msgid "Signup"
+msgstr ""
+
 #: templates/InvenTree/settings/navbar.html:12
 #: templates/InvenTree/settings/user_settings.html:9
 msgid "User Settings"
@@ -6198,22 +6277,27 @@ msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
-msgid "Barcodes"
+#: templates/InvenTree/settings/navbar.html:73 templates/navbar.html:87
+msgid "Login"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:77
 #: templates/InvenTree/settings/navbar.html:79
-msgid "Currencies"
+msgid "Barcodes"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:83
 #: templates/InvenTree/settings/navbar.html:85
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
 msgid "Reporting"
 msgstr ""
 
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103
 msgid "Categories"
 msgstr ""
 
@@ -6254,21 +6338,21 @@ msgstr ""
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:153
+#: templates/InvenTree/settings/settings.html:154
 msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:175
-#: templates/InvenTree/settings/settings.html:274
-msgid "Edit Template"
-msgstr ""
-
 #: templates/InvenTree/settings/settings.html:176
 #: templates/InvenTree/settings/settings.html:275
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/settings.html:177
+#: templates/InvenTree/settings/settings.html:276
 msgid "Delete Template"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:254
+#: templates/InvenTree/settings/settings.html:255
 msgid "No part parameter templates found"
 msgstr ""
 
@@ -6280,70 +6364,136 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:9
+#: templates/InvenTree/settings/user.html:11
 msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:15
+#: templates/InvenTree/settings/user.html:19
 #: templates/js/translated/helpers.js:26
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:17
+#: templates/InvenTree/settings/user.html:21
+#: templates/account/password_reset_from_key.html:4
+#: templates/account/password_reset_from_key.html:7
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:24
-#: templates/registration/login.html:58
+#: templates/InvenTree/settings/user.html:28
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:32
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:36
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
-msgid "Email Address"
+#: templates/InvenTree/settings/user.html:42
+msgid "E-Mail"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:42
-msgid "Theme Settings"
+#: templates/InvenTree/settings/user.html:47
+msgid "The following e-mail addresses are associated with your account:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:61
+msgid "Verified"
 msgstr ""
 
 #: templates/InvenTree/settings/user.html:63
+msgid "Unverified"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:65
+msgid "Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:71
+msgid "Make Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:72
+msgid "Re-send Verification"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:73
+#: templates/InvenTree/settings/user.html:130
+msgid "Remove"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:80
+msgid "Warning:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:81
+msgid "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."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:88
+msgid "Add E-mail Address"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:93
+msgid "Add E-mail"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:100
+msgid "Social Accounts"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:105
+msgid "You can sign in to your account using any of the following third party accounts:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:138
+msgid "You currently have no social network accounts connected to this account."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:142
+msgid "Add a 3rd Party Account"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:153
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:174
 msgid "Set Theme"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:70
+#: templates/InvenTree/settings/user.html:181
 msgid "Language Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:89
+#: templates/InvenTree/settings/user.html:200
 #, python-format
 msgid "%(lang_translated)s%% translated"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:91
+#: templates/InvenTree/settings/user.html:202
 msgid "No translations available"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:98
+#: templates/InvenTree/settings/user.html:209
 msgid "Set Language"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:103
+#: templates/InvenTree/settings/user.html:214
 msgid "Help the translation efforts!"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:104
+#: templates/InvenTree/settings/user.html:215
 #, python-format
 msgid "Native language translation of the InvenTree web application is <a href=\"%(link)s\">community contributed via crowdin</a>. Contributions are welcomed and encouraged."
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:223
+msgid "Do you really want to remove the selected e-mail address?"
+msgstr ""
+
 #: templates/InvenTree/settings/user_forms.html:9
 msgid "Form Settings"
 msgstr ""
@@ -6435,6 +6585,109 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#: templates/account/email_confirm.html:6
+#: templates/account/email_confirm.html:10
+msgid "Confirm E-mail Address"
+msgstr ""
+
+#: templates/account/email_confirm.html:16
+#, python-format
+msgid "Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail address for user %(user_display)s."
+msgstr ""
+
+#: templates/account/email_confirm.html:27
+#, python-format
+msgid "This e-mail confirmation link expired or is invalid. Please <a href=\"%(email_url)s\">issue a new e-mail confirmation request</a>."
+msgstr ""
+
+#: templates/account/login.html:5 templates/account/login.html:14
+#: templates/account/login.html:36
+msgid "Sign In"
+msgstr ""
+
+#: templates/account/login.html:19
+#, python-format
+msgid ""
+"Please sign in with one\n"
+"of your existing third party accounts or  <a class=\"btn btn-primary btn-small\" href=\"%(signup_url)s\">sign up</a>\n"
+"for a account and sign in below:"
+msgstr ""
+
+#: templates/account/login.html:23
+#, python-format
+msgid ""
+"If you have not created an account yet, then please\n"
+"<a href=\"%(signup_url)s\">sign up</a> first."
+msgstr ""
+
+#: templates/account/login.html:38
+#, fuzzy
+#| msgid "Confirm password"
+msgid "Forgot Password?"
+msgstr "Conferma la password"
+
+#: templates/account/login.html:45
+msgid "or use SSO"
+msgstr ""
+
+#: templates/account/logout.html:5 templates/account/logout.html:8
+#: templates/account/logout.html:17
+msgid "Sign Out"
+msgstr ""
+
+#: templates/account/logout.html:10
+msgid "Are you sure you want to sign out?"
+msgstr ""
+
+#: templates/account/password_reset.html:5
+#: templates/account/password_reset.html:12
+msgid "Password Reset"
+msgstr ""
+
+#: templates/account/password_reset.html:18
+msgid "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it."
+msgstr ""
+
+#: templates/account/password_reset.html:23
+msgid "Reset My Password"
+msgstr ""
+
+#: templates/account/password_reset.html:27 templates/account/signup.html:36
+msgid "This function is currently disabled. Please contact an administrator."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:7
+msgid "Bad Token"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:11
+#, python-format
+msgid "The password reset link was invalid, possibly because it has already been used.  Please request a <a href=\"%(passwd_reset_url)s\">new password reset</a>."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:17
+#, fuzzy
+#| msgid "Enter password"
+msgid "change password"
+msgstr "Inserire la password"
+
+#: templates/account/password_reset_from_key.html:20
+msgid "Your password is now changed."
+msgstr ""
+
+#: templates/account/signup.html:11 templates/account/signup.html:22
+msgid "Sign Up"
+msgstr ""
+
+#: templates/account/signup.html:13
+#, python-format
+msgid "Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>."
+msgstr ""
+
+#: templates/account/signup.html:27
+msgid "Or use a SSO-provider for signup"
+msgstr ""
+
 #: templates/image_download.html:8
 msgid "Specify URL for downloading image"
 msgstr ""
@@ -7578,7 +7831,7 @@ msgstr ""
 msgid "Add Stock"
 msgstr ""
 
-#: templates/js/translated/stock.js:165 users/models.py:190
+#: templates/js/translated/stock.js:165 users/models.py:195
 msgid "Add"
 msgstr ""
 
@@ -8035,10 +8288,6 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: templates/navbar.html:87 templates/registration/login.html:89
-msgid "Login"
-msgstr ""
-
 #: templates/navbar.html:106
 msgid "About InvenTree"
 msgstr ""
@@ -8047,68 +8296,12 @@ msgstr ""
 msgid "QR data not provided"
 msgstr ""
 
-#: templates/registration/logged_out.html:50
-msgid "You have been logged out"
+#: templates/registration/logged_out.html:6
+msgid "You were logged out successfully."
 msgstr ""
 
-#: templates/registration/logged_out.html:51
-#: templates/registration/password_reset_complete.html:51
-#: templates/registration/password_reset_done.html:58
-msgid "Return to login screen"
-msgstr ""
-
-#: templates/registration/login.html:64
-msgid "Enter username"
-msgstr ""
-
-#: templates/registration/login.html:70
-msgid "Password"
-msgstr ""
-
-#: templates/registration/login.html:83
-msgid "Username / password combination is incorrect"
-msgstr ""
-
-#: templates/registration/login.html:95
-#: templates/registration/password_reset_form.html:51
-msgid "Forgotten your password?"
-msgstr ""
-
-#: templates/registration/login.html:95
-msgid "Click here to reset"
-msgstr ""
-
-#: templates/registration/password_reset_complete.html:50
-msgid "Password reset complete"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:52
-#: templates/registration/password_reset_confirm.html:56
-msgid "Change password"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:60
-msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:51
-msgid "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:54
-msgid "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:52
-msgid "Enter your email address below."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:53
-msgid "An email will be sent with password reset instructions."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:58
-msgid "Send email"
+#: templates/registration/logged_out.html:8
+msgid "Log in again"
 msgstr ""
 
 #: templates/stats.html:13
@@ -8247,34 +8440,34 @@ msgstr ""
 msgid "Important dates"
 msgstr ""
 
-#: users/models.py:177
+#: users/models.py:182
 msgid "Permission set"
 msgstr ""
 
-#: users/models.py:185
+#: users/models.py:190
 msgid "Group"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "View"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "Permission to view items"
 msgstr ""
 
-#: users/models.py:190
+#: users/models.py:195
 msgid "Permission to add items"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Change"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Permissions to edit items"
 msgstr ""
 
-#: users/models.py:194
+#: users/models.py:199
 msgid "Permission to delete items"
 msgstr ""
diff --git a/InvenTree/locale/ja/LC_MESSAGES/django.po b/InvenTree/locale/ja/LC_MESSAGES/django.po
index d26a21c584..51d2b48bf5 100644
--- a/InvenTree/locale/ja/LC_MESSAGES/django.po
+++ b/InvenTree/locale/ja/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-11 01:01+0000\n"
+"POT-Creation-Date: 2021-10-11 06:21+0000\n"
 "PO-Revision-Date: 2021-09-12 13:44\n"
 "Last-Translator: \n"
 "Language-Team: Japanese\n"
@@ -33,41 +33,54 @@ msgstr "一致するアクションが見つかりませんでした"
 msgid "Enter date"
 msgstr "日付を入力する"
 
-#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:116 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:173 build/forms.py:215 order/forms.py:27
 #: order/forms.py:38 order/forms.py:49 order/forms.py:60 order/forms.py:71
-#: part/forms.py:108 templates/js/translated/forms.js:564
+#: part/forms.py:108 templates/account/email_confirm.html:20
+#: templates/js/translated/forms.js:564
 msgid "Confirm"
 msgstr "確認"
 
-#: InvenTree/forms.py:127
+#: InvenTree/forms.py:132
 msgid "Confirm delete"
 msgstr "削除の確認"
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:133
 msgid "Confirm item deletion"
 msgstr "削除の確認"
 
-#: InvenTree/forms.py:160 templates/registration/login.html:76
+#: InvenTree/forms.py:164
 msgid "Enter password"
 msgstr "パスワードを入力してください"
 
-#: InvenTree/forms.py:161
+#: InvenTree/forms.py:165
 msgid "Enter new password"
 msgstr "新しいパスワードを入力してください。"
 
-#: InvenTree/forms.py:168
+#: InvenTree/forms.py:172
 msgid "Confirm password"
 msgstr "パスワードの確認"
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:173
 msgid "Confirm new password"
 msgstr "新しいパスワードの確認"
 
-#: InvenTree/forms.py:201
+#: InvenTree/forms.py:205
 msgid "Select Category"
 msgstr "カテゴリの選択"
 
+#: InvenTree/forms.py:226
+msgid "E-mail (again)"
+msgstr ""
+
+#: InvenTree/forms.py:230
+msgid "E-mail address confirmation"
+msgstr ""
+
+#: InvenTree/forms.py:250
+msgid "You must type the same email each time."
+msgstr ""
+
 #: InvenTree/helpers.py:401
 #, python-brace-format
 msgid "Duplicate serial: {n}"
@@ -118,8 +131,8 @@ msgstr "コメント："
 msgid "File comment"
 msgstr "ファイルコメント"
 
-#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1011
-#: common/models.py:1012 part/models.py:2055
+#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1055
+#: common/models.py:1056 part/models.py:2055
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/translated/stock.js:1669
 msgid "User"
@@ -205,75 +218,75 @@ msgstr "有効な数字でなければなりません"
 msgid "Filename"
 msgstr ""
 
-#: InvenTree/settings.py:523
+#: InvenTree/settings.py:529
 msgid "German"
 msgstr "ドイツ語"
 
-#: InvenTree/settings.py:524
+#: InvenTree/settings.py:530
 msgid "Greek"
 msgstr ""
 
-#: InvenTree/settings.py:525
+#: InvenTree/settings.py:531
 msgid "English"
 msgstr "英語"
 
-#: InvenTree/settings.py:526
+#: InvenTree/settings.py:532
 msgid "Spanish"
 msgstr ""
 
-#: InvenTree/settings.py:527
+#: InvenTree/settings.py:533
 msgid "French"
 msgstr "フランス語"
 
-#: InvenTree/settings.py:528
+#: InvenTree/settings.py:534
 msgid "Hebrew"
 msgstr ""
 
-#: InvenTree/settings.py:529
+#: InvenTree/settings.py:535
 msgid "Italian"
 msgstr ""
 
-#: InvenTree/settings.py:530
+#: InvenTree/settings.py:536
 msgid "Japanese"
 msgstr ""
 
-#: InvenTree/settings.py:531
+#: InvenTree/settings.py:537
 msgid "Korean"
 msgstr ""
 
-#: InvenTree/settings.py:532
+#: InvenTree/settings.py:538
 msgid "Dutch"
 msgstr ""
 
-#: InvenTree/settings.py:533
+#: InvenTree/settings.py:539
 msgid "Norwegian"
 msgstr ""
 
-#: InvenTree/settings.py:534
+#: InvenTree/settings.py:540
 msgid "Polish"
 msgstr "ポーランド語"
 
-#: InvenTree/settings.py:535
+#: InvenTree/settings.py:541
 msgid "Russian"
 msgstr ""
 
-#: InvenTree/settings.py:536
+#: InvenTree/settings.py:542
 msgid "Swedish"
 msgstr ""
 
-#: InvenTree/settings.py:537
+#: InvenTree/settings.py:543
 msgid "Thai"
 msgstr ""
 
-#: InvenTree/settings.py:538
+#: InvenTree/settings.py:544
 msgid "Turkish"
 msgstr "トルコ語"
 
-#: InvenTree/settings.py:539
+#: InvenTree/settings.py:545
 msgid "Vietnamese"
 msgstr ""
 
-#: InvenTree/settings.py:540
+#: InvenTree/settings.py:546
 msgid "Chinese"
 msgstr ""
 
@@ -458,27 +471,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:610
+#: InvenTree/views.py:616
 msgid "Delete Item"
 msgstr ""
 
-#: InvenTree/views.py:659
+#: InvenTree/views.py:665
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:674 templates/InvenTree/settings/user.html:14
+#: InvenTree/views.py:680 templates/InvenTree/settings/user.html:18
 msgid "Edit User Information"
 msgstr ""
 
-#: InvenTree/views.py:685 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:691 templates/InvenTree/settings/user.html:22
 msgid "Set Password"
 msgstr ""
 
-#: InvenTree/views.py:704
+#: InvenTree/views.py:710
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:910 templates/navbar.html:97
+#: InvenTree/views.py:954 templates/navbar.html:97
 msgid "System Information"
 msgstr ""
 
@@ -551,7 +564,7 @@ msgstr ""
 #: build/forms.py:48 build/forms.py:90 build/models.py:1281
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:1043
+#: build/templates/build/detail.html:34 common/models.py:1087
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:101 order/forms.py:123 order/models.py:720
 #: order/models.py:982 order/templates/order/order_wizard/match_parts.html:30
@@ -681,8 +694,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:50
 #: part/templates/part/navbar.html:53 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:171
-#: templates/InvenTree/settings/navbar.html:107
-#: templates/InvenTree/settings/navbar.html:109 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1543,7 +1556,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:308 common/models.py:843 common/models.py:1004
+#: common/models.py:308 common/models.py:887 common/models.py:1048
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1957,196 +1970,254 @@ msgstr ""
 msgid "Enable PO functionality in InvenTree interface"
 msgstr ""
 
+#: common/models.py:836
+#, fuzzy
+#| msgid "Enter password"
+msgid "Enable password forgot"
+msgstr "パスワードを入力してください"
+
+#: common/models.py:837
+msgid "Enable password forgot function on the login-pages"
+msgstr ""
+
+#: common/models.py:842
+msgid "Enable registration"
+msgstr ""
+
+#: common/models.py:843
+msgid "Enable self-registration for users on the login-pages"
+msgstr ""
+
+#: common/models.py:848
+msgid "Enable SSO"
+msgstr ""
+
+#: common/models.py:849
+msgid "Enable SSO on the login-pages"
+msgstr ""
+
 #: common/models.py:854
-msgid "Show starred parts"
+msgid "E-Mail required"
 msgstr ""
 
 #: common/models.py:855
-msgid "Show starred parts on the homepage"
+msgid "Require user to supply mail on signup"
 msgstr ""
 
 #: common/models.py:860
-msgid "Show latest parts"
+msgid "Auto-fill SSO users"
 msgstr ""
 
 #: common/models.py:861
-msgid "Show latest parts on the homepage"
+msgid "Automatically fill out user-details from SSO account-data"
 msgstr ""
 
 #: common/models.py:866
-msgid "Recent Part Count"
+msgid "Mail twice"
 msgstr ""
 
 #: common/models.py:867
-msgid "Number of recent parts to display on index page"
+msgid "On signup ask users twice for their mail"
+msgstr ""
+
+#: common/models.py:872
+msgid "Password twice"
 msgstr ""
 
 #: common/models.py:873
-msgid "Show unvalidated BOMs"
-msgstr ""
-
-#: common/models.py:874
-msgid "Show BOMs that await validation on the homepage"
-msgstr ""
-
-#: common/models.py:879
-msgid "Show recent stock changes"
-msgstr ""
-
-#: common/models.py:880
-msgid "Show recently changed stock items on the homepage"
-msgstr ""
-
-#: common/models.py:885
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:886
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:891
-msgid "Show low stock"
-msgstr ""
-
-#: common/models.py:892
-msgid "Show low stock items on the homepage"
-msgstr ""
-
-#: common/models.py:897
-msgid "Show depleted stock"
+msgid "On signup ask users twice for their password"
 msgstr ""
 
 #: common/models.py:898
-msgid "Show depleted stock items on the homepage"
+msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:903
-msgid "Show needed stock"
+#: common/models.py:899
+msgid "Show starred parts on the homepage"
 msgstr ""
 
 #: common/models.py:904
-msgid "Show stock items needed for builds on the homepage"
+msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:909
-msgid "Show expired stock"
+#: common/models.py:905
+msgid "Show latest parts on the homepage"
 msgstr ""
 
 #: common/models.py:910
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:911
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:917
+msgid "Show unvalidated BOMs"
+msgstr ""
+
+#: common/models.py:918
+msgid "Show BOMs that await validation on the homepage"
+msgstr ""
+
+#: common/models.py:923
+msgid "Show recent stock changes"
+msgstr ""
+
+#: common/models.py:924
+msgid "Show recently changed stock items on the homepage"
+msgstr ""
+
+#: common/models.py:929
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:930
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:935
+msgid "Show low stock"
+msgstr ""
+
+#: common/models.py:936
+msgid "Show low stock items on the homepage"
+msgstr ""
+
+#: common/models.py:941
+msgid "Show depleted stock"
+msgstr ""
+
+#: common/models.py:942
+msgid "Show depleted stock items on the homepage"
+msgstr ""
+
+#: common/models.py:947
+msgid "Show needed stock"
+msgstr ""
+
+#: common/models.py:948
+msgid "Show stock items needed for builds on the homepage"
+msgstr ""
+
+#: common/models.py:953
+msgid "Show expired stock"
+msgstr ""
+
+#: common/models.py:954
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:915
+#: common/models.py:959
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:916
+#: common/models.py:960
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:921
+#: common/models.py:965
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:922
+#: common/models.py:966
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:927
+#: common/models.py:971
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:928
+#: common/models.py:972
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:933
+#: common/models.py:977
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:934
+#: common/models.py:978
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:939
+#: common/models.py:983
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:940
+#: common/models.py:984
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:945
+#: common/models.py:989
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:946
+#: common/models.py:990
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:951
+#: common/models.py:995
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:952
+#: common/models.py:996
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:958
+#: common/models.py:1002
 msgid "Inline label display"
 msgstr ""
 
-#: common/models.py:959
+#: common/models.py:1003
 msgid "Display PDF labels in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:965
+#: common/models.py:1009
 msgid "Inline report display"
 msgstr ""
 
-#: common/models.py:966
+#: common/models.py:1010
 msgid "Display PDF reports in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:972
+#: common/models.py:1016
 msgid "Search Preview Results"
 msgstr ""
 
-#: common/models.py:973
+#: common/models.py:1017
 msgid "Number of results to show in search preview window"
 msgstr ""
 
-#: common/models.py:979
+#: common/models.py:1023
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:980
+#: common/models.py:1024
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:986
+#: common/models.py:1030
 msgid "Escape Key Closes Forms"
 msgstr ""
 
-#: common/models.py:987
+#: common/models.py:1031
 msgid "Use the escape key to close modal forms"
 msgstr ""
 
-#: common/models.py:1044 company/forms.py:43
+#: common/models.py:1088 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:1051 company/templates/company/supplier_part.html:231
+#: common/models.py:1095 company/templates/company/supplier_part.html:231
 #: templates/js/translated/part.js:1369
 msgid "Price"
 msgstr ""
 
-#: common/models.py:1052
+#: common/models.py:1096
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1145
+#: common/models.py:1189
 msgid "Default"
 msgstr ""
 
@@ -2595,8 +2666,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:82
 #: part/templates/part/navbar.html:85 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:229
-#: templates/InvenTree/settings/navbar.html:113
-#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:119
+#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:44
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2619,8 +2690,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:91
 #: part/templates/part/navbar.html:94 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:249
-#: templates/InvenTree/settings/navbar.html:119
-#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:55
+#: templates/InvenTree/settings/navbar.html:125
+#: templates/InvenTree/settings/navbar.html:127 templates/navbar.html:55
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2706,7 +2777,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part.html:239
 #: part/templates/part/detail.html:214 part/templates/part/detail.html:294
 #: part/templates/part/detail.html:317 templates/js/translated/company.js:424
-#: templates/js/translated/helpers.js:31 users/models.py:194
+#: templates/js/translated/helpers.js:31 users/models.py:199
 msgid "Delete"
 msgstr ""
 
@@ -2755,8 +2826,8 @@ msgstr "メーカー・パーツの在庫"
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:182
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109
 #: templates/js/translated/part.js:540 templates/js/translated/part.js:769
 #: templates/js/translated/part.js:945 templates/js/translated/stock.js:182
 #: templates/js/translated/stock.js:829 templates/navbar.html:32
@@ -3714,8 +3785,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
 #: templates/js/translated/part.js:1165 templates/navbar.html:29
 #: templates/stats.html:80 templates/stats.html:89 users/models.py:41
 msgid "Parts"
@@ -3929,7 +4000,7 @@ msgstr ""
 
 #: part/models.py:696 part/models.py:2299
 #: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:168
+#: templates/InvenTree/settings/settings.html:169
 #: templates/js/translated/part.js:927
 msgid "Category"
 msgstr ""
@@ -4119,7 +4190,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2256 part/models.py:2305 part/models.py:2306
-#: templates/InvenTree/settings/settings.html:163
+#: templates/InvenTree/settings/settings.html:164
 msgid "Parameter Template"
 msgstr ""
 
@@ -4131,7 +4202,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2310 templates/InvenTree/settings/settings.html:172
+#: part/models.py:2310 templates/InvenTree/settings/settings.html:173
 msgid "Default Value"
 msgstr ""
 
@@ -6147,6 +6218,14 @@ msgstr ""
 msgid "Setting"
 msgstr ""
 
+#: templates/InvenTree/settings/login.html:9
+msgid "Login Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/login.html:22 templates/account/signup.html:5
+msgid "Signup"
+msgstr ""
+
 #: templates/InvenTree/settings/navbar.html:12
 #: templates/InvenTree/settings/user_settings.html:9
 msgid "User Settings"
@@ -6200,22 +6279,27 @@ msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
-msgid "Barcodes"
+#: templates/InvenTree/settings/navbar.html:73 templates/navbar.html:87
+msgid "Login"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:77
 #: templates/InvenTree/settings/navbar.html:79
-msgid "Currencies"
+msgid "Barcodes"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:83
 #: templates/InvenTree/settings/navbar.html:85
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
 msgid "Reporting"
 msgstr ""
 
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103
 msgid "Categories"
 msgstr ""
 
@@ -6256,21 +6340,21 @@ msgstr ""
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:153
+#: templates/InvenTree/settings/settings.html:154
 msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:175
-#: templates/InvenTree/settings/settings.html:274
-msgid "Edit Template"
-msgstr ""
-
 #: templates/InvenTree/settings/settings.html:176
 #: templates/InvenTree/settings/settings.html:275
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/settings.html:177
+#: templates/InvenTree/settings/settings.html:276
 msgid "Delete Template"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:254
+#: templates/InvenTree/settings/settings.html:255
 msgid "No part parameter templates found"
 msgstr ""
 
@@ -6282,70 +6366,136 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:9
+#: templates/InvenTree/settings/user.html:11
 msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:15
+#: templates/InvenTree/settings/user.html:19
 #: templates/js/translated/helpers.js:26
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:17
+#: templates/InvenTree/settings/user.html:21
+#: templates/account/password_reset_from_key.html:4
+#: templates/account/password_reset_from_key.html:7
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:24
-#: templates/registration/login.html:58
+#: templates/InvenTree/settings/user.html:28
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:32
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:36
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
-msgid "Email Address"
+#: templates/InvenTree/settings/user.html:42
+msgid "E-Mail"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:42
-msgid "Theme Settings"
+#: templates/InvenTree/settings/user.html:47
+msgid "The following e-mail addresses are associated with your account:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:61
+msgid "Verified"
 msgstr ""
 
 #: templates/InvenTree/settings/user.html:63
+msgid "Unverified"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:65
+msgid "Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:71
+msgid "Make Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:72
+msgid "Re-send Verification"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:73
+#: templates/InvenTree/settings/user.html:130
+msgid "Remove"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:80
+msgid "Warning:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:81
+msgid "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."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:88
+msgid "Add E-mail Address"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:93
+msgid "Add E-mail"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:100
+msgid "Social Accounts"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:105
+msgid "You can sign in to your account using any of the following third party accounts:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:138
+msgid "You currently have no social network accounts connected to this account."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:142
+msgid "Add a 3rd Party Account"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:153
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:174
 msgid "Set Theme"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:70
+#: templates/InvenTree/settings/user.html:181
 msgid "Language Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:89
+#: templates/InvenTree/settings/user.html:200
 #, python-format
 msgid "%(lang_translated)s%% translated"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:91
+#: templates/InvenTree/settings/user.html:202
 msgid "No translations available"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:98
+#: templates/InvenTree/settings/user.html:209
 msgid "Set Language"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:103
+#: templates/InvenTree/settings/user.html:214
 msgid "Help the translation efforts!"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:104
+#: templates/InvenTree/settings/user.html:215
 #, python-format
 msgid "Native language translation of the InvenTree web application is <a href=\"%(link)s\">community contributed via crowdin</a>. Contributions are welcomed and encouraged."
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:223
+msgid "Do you really want to remove the selected e-mail address?"
+msgstr ""
+
 #: templates/InvenTree/settings/user_forms.html:9
 msgid "Form Settings"
 msgstr ""
@@ -6437,6 +6587,109 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#: templates/account/email_confirm.html:6
+#: templates/account/email_confirm.html:10
+msgid "Confirm E-mail Address"
+msgstr ""
+
+#: templates/account/email_confirm.html:16
+#, python-format
+msgid "Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail address for user %(user_display)s."
+msgstr ""
+
+#: templates/account/email_confirm.html:27
+#, python-format
+msgid "This e-mail confirmation link expired or is invalid. Please <a href=\"%(email_url)s\">issue a new e-mail confirmation request</a>."
+msgstr ""
+
+#: templates/account/login.html:5 templates/account/login.html:14
+#: templates/account/login.html:36
+msgid "Sign In"
+msgstr ""
+
+#: templates/account/login.html:19
+#, python-format
+msgid ""
+"Please sign in with one\n"
+"of your existing third party accounts or  <a class=\"btn btn-primary btn-small\" href=\"%(signup_url)s\">sign up</a>\n"
+"for a account and sign in below:"
+msgstr ""
+
+#: templates/account/login.html:23
+#, python-format
+msgid ""
+"If you have not created an account yet, then please\n"
+"<a href=\"%(signup_url)s\">sign up</a> first."
+msgstr ""
+
+#: templates/account/login.html:38
+#, fuzzy
+#| msgid "Confirm password"
+msgid "Forgot Password?"
+msgstr "パスワードの確認"
+
+#: templates/account/login.html:45
+msgid "or use SSO"
+msgstr ""
+
+#: templates/account/logout.html:5 templates/account/logout.html:8
+#: templates/account/logout.html:17
+msgid "Sign Out"
+msgstr ""
+
+#: templates/account/logout.html:10
+msgid "Are you sure you want to sign out?"
+msgstr ""
+
+#: templates/account/password_reset.html:5
+#: templates/account/password_reset.html:12
+msgid "Password Reset"
+msgstr ""
+
+#: templates/account/password_reset.html:18
+msgid "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it."
+msgstr ""
+
+#: templates/account/password_reset.html:23
+msgid "Reset My Password"
+msgstr ""
+
+#: templates/account/password_reset.html:27 templates/account/signup.html:36
+msgid "This function is currently disabled. Please contact an administrator."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:7
+msgid "Bad Token"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:11
+#, python-format
+msgid "The password reset link was invalid, possibly because it has already been used.  Please request a <a href=\"%(passwd_reset_url)s\">new password reset</a>."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:17
+#, fuzzy
+#| msgid "Enter password"
+msgid "change password"
+msgstr "パスワードを入力してください"
+
+#: templates/account/password_reset_from_key.html:20
+msgid "Your password is now changed."
+msgstr ""
+
+#: templates/account/signup.html:11 templates/account/signup.html:22
+msgid "Sign Up"
+msgstr ""
+
+#: templates/account/signup.html:13
+#, python-format
+msgid "Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>."
+msgstr ""
+
+#: templates/account/signup.html:27
+msgid "Or use a SSO-provider for signup"
+msgstr ""
+
 #: templates/image_download.html:8
 msgid "Specify URL for downloading image"
 msgstr ""
@@ -7586,7 +7839,7 @@ msgstr ""
 msgid "Add Stock"
 msgstr ""
 
-#: templates/js/translated/stock.js:165 users/models.py:190
+#: templates/js/translated/stock.js:165 users/models.py:195
 msgid "Add"
 msgstr ""
 
@@ -8043,10 +8296,6 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: templates/navbar.html:87 templates/registration/login.html:89
-msgid "Login"
-msgstr ""
-
 #: templates/navbar.html:106
 msgid "About InvenTree"
 msgstr ""
@@ -8055,68 +8304,12 @@ msgstr ""
 msgid "QR data not provided"
 msgstr ""
 
-#: templates/registration/logged_out.html:50
-msgid "You have been logged out"
+#: templates/registration/logged_out.html:6
+msgid "You were logged out successfully."
 msgstr ""
 
-#: templates/registration/logged_out.html:51
-#: templates/registration/password_reset_complete.html:51
-#: templates/registration/password_reset_done.html:58
-msgid "Return to login screen"
-msgstr ""
-
-#: templates/registration/login.html:64
-msgid "Enter username"
-msgstr ""
-
-#: templates/registration/login.html:70
-msgid "Password"
-msgstr ""
-
-#: templates/registration/login.html:83
-msgid "Username / password combination is incorrect"
-msgstr ""
-
-#: templates/registration/login.html:95
-#: templates/registration/password_reset_form.html:51
-msgid "Forgotten your password?"
-msgstr ""
-
-#: templates/registration/login.html:95
-msgid "Click here to reset"
-msgstr ""
-
-#: templates/registration/password_reset_complete.html:50
-msgid "Password reset complete"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:52
-#: templates/registration/password_reset_confirm.html:56
-msgid "Change password"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:60
-msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:51
-msgid "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:54
-msgid "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:52
-msgid "Enter your email address below."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:53
-msgid "An email will be sent with password reset instructions."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:58
-msgid "Send email"
+#: templates/registration/logged_out.html:8
+msgid "Log in again"
 msgstr ""
 
 #: templates/stats.html:13
@@ -8255,34 +8448,34 @@ msgstr ""
 msgid "Important dates"
 msgstr ""
 
-#: users/models.py:177
+#: users/models.py:182
 msgid "Permission set"
 msgstr ""
 
-#: users/models.py:185
+#: users/models.py:190
 msgid "Group"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "View"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "Permission to view items"
 msgstr ""
 
-#: users/models.py:190
+#: users/models.py:195
 msgid "Permission to add items"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Change"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Permissions to edit items"
 msgstr ""
 
-#: users/models.py:194
+#: users/models.py:199
 msgid "Permission to delete items"
 msgstr ""
diff --git a/InvenTree/locale/ko/LC_MESSAGES/django.po b/InvenTree/locale/ko/LC_MESSAGES/django.po
index 17e1cfaad1..206b9a64a6 100644
--- a/InvenTree/locale/ko/LC_MESSAGES/django.po
+++ b/InvenTree/locale/ko/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-11 01:01+0000\n"
+"POT-Creation-Date: 2021-10-11 06:21+0000\n"
 "PO-Revision-Date: 2021-09-12 13:44\n"
 "Last-Translator: \n"
 "Language-Team: Korean\n"
@@ -33,41 +33,54 @@ msgstr ""
 msgid "Enter date"
 msgstr ""
 
-#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:116 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:173 build/forms.py:215 order/forms.py:27
 #: order/forms.py:38 order/forms.py:49 order/forms.py:60 order/forms.py:71
-#: part/forms.py:108 templates/js/translated/forms.js:564
+#: part/forms.py:108 templates/account/email_confirm.html:20
+#: templates/js/translated/forms.js:564
 msgid "Confirm"
 msgstr ""
 
-#: InvenTree/forms.py:127
+#: InvenTree/forms.py:132
 msgid "Confirm delete"
 msgstr ""
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:133
 msgid "Confirm item deletion"
 msgstr ""
 
-#: InvenTree/forms.py:160 templates/registration/login.html:76
+#: InvenTree/forms.py:164
 msgid "Enter password"
 msgstr ""
 
-#: InvenTree/forms.py:161
+#: InvenTree/forms.py:165
 msgid "Enter new password"
 msgstr ""
 
-#: InvenTree/forms.py:168
+#: InvenTree/forms.py:172
 msgid "Confirm password"
 msgstr ""
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:173
 msgid "Confirm new password"
 msgstr ""
 
-#: InvenTree/forms.py:201
+#: InvenTree/forms.py:205
 msgid "Select Category"
 msgstr ""
 
+#: InvenTree/forms.py:226
+msgid "E-mail (again)"
+msgstr ""
+
+#: InvenTree/forms.py:230
+msgid "E-mail address confirmation"
+msgstr ""
+
+#: InvenTree/forms.py:250
+msgid "You must type the same email each time."
+msgstr ""
+
 #: InvenTree/helpers.py:401
 #, python-brace-format
 msgid "Duplicate serial: {n}"
@@ -118,8 +131,8 @@ msgstr ""
 msgid "File comment"
 msgstr ""
 
-#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1011
-#: common/models.py:1012 part/models.py:2055
+#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1055
+#: common/models.py:1056 part/models.py:2055
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/translated/stock.js:1669
 msgid "User"
@@ -205,75 +218,75 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: InvenTree/settings.py:523
+#: InvenTree/settings.py:529
 msgid "German"
 msgstr ""
 
-#: InvenTree/settings.py:524
+#: InvenTree/settings.py:530
 msgid "Greek"
 msgstr ""
 
-#: InvenTree/settings.py:525
+#: InvenTree/settings.py:531
 msgid "English"
 msgstr ""
 
-#: InvenTree/settings.py:526
+#: InvenTree/settings.py:532
 msgid "Spanish"
 msgstr ""
 
-#: InvenTree/settings.py:527
+#: InvenTree/settings.py:533
 msgid "French"
 msgstr ""
 
-#: InvenTree/settings.py:528
+#: InvenTree/settings.py:534
 msgid "Hebrew"
 msgstr ""
 
-#: InvenTree/settings.py:529
+#: InvenTree/settings.py:535
 msgid "Italian"
 msgstr ""
 
-#: InvenTree/settings.py:530
+#: InvenTree/settings.py:536
 msgid "Japanese"
 msgstr ""
 
-#: InvenTree/settings.py:531
+#: InvenTree/settings.py:537
 msgid "Korean"
 msgstr ""
 
-#: InvenTree/settings.py:532
+#: InvenTree/settings.py:538
 msgid "Dutch"
 msgstr ""
 
-#: InvenTree/settings.py:533
+#: InvenTree/settings.py:539
 msgid "Norwegian"
 msgstr ""
 
-#: InvenTree/settings.py:534
+#: InvenTree/settings.py:540
 msgid "Polish"
 msgstr ""
 
-#: InvenTree/settings.py:535
+#: InvenTree/settings.py:541
 msgid "Russian"
 msgstr ""
 
-#: InvenTree/settings.py:536
+#: InvenTree/settings.py:542
 msgid "Swedish"
 msgstr ""
 
-#: InvenTree/settings.py:537
+#: InvenTree/settings.py:543
 msgid "Thai"
 msgstr ""
 
-#: InvenTree/settings.py:538
+#: InvenTree/settings.py:544
 msgid "Turkish"
 msgstr ""
 
-#: InvenTree/settings.py:539
+#: InvenTree/settings.py:545
 msgid "Vietnamese"
 msgstr ""
 
-#: InvenTree/settings.py:540
+#: InvenTree/settings.py:546
 msgid "Chinese"
 msgstr ""
 
@@ -458,27 +471,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:610
+#: InvenTree/views.py:616
 msgid "Delete Item"
 msgstr ""
 
-#: InvenTree/views.py:659
+#: InvenTree/views.py:665
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:674 templates/InvenTree/settings/user.html:14
+#: InvenTree/views.py:680 templates/InvenTree/settings/user.html:18
 msgid "Edit User Information"
 msgstr ""
 
-#: InvenTree/views.py:685 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:691 templates/InvenTree/settings/user.html:22
 msgid "Set Password"
 msgstr ""
 
-#: InvenTree/views.py:704
+#: InvenTree/views.py:710
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:910 templates/navbar.html:97
+#: InvenTree/views.py:954 templates/navbar.html:97
 msgid "System Information"
 msgstr ""
 
@@ -551,7 +564,7 @@ msgstr ""
 #: build/forms.py:48 build/forms.py:90 build/models.py:1281
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:1043
+#: build/templates/build/detail.html:34 common/models.py:1087
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:101 order/forms.py:123 order/models.py:720
 #: order/models.py:982 order/templates/order/order_wizard/match_parts.html:30
@@ -681,8 +694,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:50
 #: part/templates/part/navbar.html:53 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:171
-#: templates/InvenTree/settings/navbar.html:107
-#: templates/InvenTree/settings/navbar.html:109 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1541,7 +1554,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:308 common/models.py:843 common/models.py:1004
+#: common/models.py:308 common/models.py:887 common/models.py:1048
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1955,196 +1968,252 @@ msgstr ""
 msgid "Enable PO functionality in InvenTree interface"
 msgstr ""
 
+#: common/models.py:836
+msgid "Enable password forgot"
+msgstr ""
+
+#: common/models.py:837
+msgid "Enable password forgot function on the login-pages"
+msgstr ""
+
+#: common/models.py:842
+msgid "Enable registration"
+msgstr ""
+
+#: common/models.py:843
+msgid "Enable self-registration for users on the login-pages"
+msgstr ""
+
+#: common/models.py:848
+msgid "Enable SSO"
+msgstr ""
+
+#: common/models.py:849
+msgid "Enable SSO on the login-pages"
+msgstr ""
+
 #: common/models.py:854
-msgid "Show starred parts"
+msgid "E-Mail required"
 msgstr ""
 
 #: common/models.py:855
-msgid "Show starred parts on the homepage"
+msgid "Require user to supply mail on signup"
 msgstr ""
 
 #: common/models.py:860
-msgid "Show latest parts"
+msgid "Auto-fill SSO users"
 msgstr ""
 
 #: common/models.py:861
-msgid "Show latest parts on the homepage"
+msgid "Automatically fill out user-details from SSO account-data"
 msgstr ""
 
 #: common/models.py:866
-msgid "Recent Part Count"
+msgid "Mail twice"
 msgstr ""
 
 #: common/models.py:867
-msgid "Number of recent parts to display on index page"
+msgid "On signup ask users twice for their mail"
+msgstr ""
+
+#: common/models.py:872
+msgid "Password twice"
 msgstr ""
 
 #: common/models.py:873
-msgid "Show unvalidated BOMs"
-msgstr ""
-
-#: common/models.py:874
-msgid "Show BOMs that await validation on the homepage"
-msgstr ""
-
-#: common/models.py:879
-msgid "Show recent stock changes"
-msgstr ""
-
-#: common/models.py:880
-msgid "Show recently changed stock items on the homepage"
-msgstr ""
-
-#: common/models.py:885
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:886
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:891
-msgid "Show low stock"
-msgstr ""
-
-#: common/models.py:892
-msgid "Show low stock items on the homepage"
-msgstr ""
-
-#: common/models.py:897
-msgid "Show depleted stock"
+msgid "On signup ask users twice for their password"
 msgstr ""
 
 #: common/models.py:898
-msgid "Show depleted stock items on the homepage"
+msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:903
-msgid "Show needed stock"
+#: common/models.py:899
+msgid "Show starred parts on the homepage"
 msgstr ""
 
 #: common/models.py:904
-msgid "Show stock items needed for builds on the homepage"
+msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:909
-msgid "Show expired stock"
+#: common/models.py:905
+msgid "Show latest parts on the homepage"
 msgstr ""
 
 #: common/models.py:910
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:911
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:917
+msgid "Show unvalidated BOMs"
+msgstr ""
+
+#: common/models.py:918
+msgid "Show BOMs that await validation on the homepage"
+msgstr ""
+
+#: common/models.py:923
+msgid "Show recent stock changes"
+msgstr ""
+
+#: common/models.py:924
+msgid "Show recently changed stock items on the homepage"
+msgstr ""
+
+#: common/models.py:929
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:930
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:935
+msgid "Show low stock"
+msgstr ""
+
+#: common/models.py:936
+msgid "Show low stock items on the homepage"
+msgstr ""
+
+#: common/models.py:941
+msgid "Show depleted stock"
+msgstr ""
+
+#: common/models.py:942
+msgid "Show depleted stock items on the homepage"
+msgstr ""
+
+#: common/models.py:947
+msgid "Show needed stock"
+msgstr ""
+
+#: common/models.py:948
+msgid "Show stock items needed for builds on the homepage"
+msgstr ""
+
+#: common/models.py:953
+msgid "Show expired stock"
+msgstr ""
+
+#: common/models.py:954
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:915
+#: common/models.py:959
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:916
+#: common/models.py:960
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:921
+#: common/models.py:965
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:922
+#: common/models.py:966
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:927
+#: common/models.py:971
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:928
+#: common/models.py:972
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:933
+#: common/models.py:977
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:934
+#: common/models.py:978
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:939
+#: common/models.py:983
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:940
+#: common/models.py:984
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:945
+#: common/models.py:989
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:946
+#: common/models.py:990
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:951
+#: common/models.py:995
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:952
+#: common/models.py:996
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:958
+#: common/models.py:1002
 msgid "Inline label display"
 msgstr ""
 
-#: common/models.py:959
+#: common/models.py:1003
 msgid "Display PDF labels in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:965
+#: common/models.py:1009
 msgid "Inline report display"
 msgstr ""
 
-#: common/models.py:966
+#: common/models.py:1010
 msgid "Display PDF reports in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:972
+#: common/models.py:1016
 msgid "Search Preview Results"
 msgstr ""
 
-#: common/models.py:973
+#: common/models.py:1017
 msgid "Number of results to show in search preview window"
 msgstr ""
 
-#: common/models.py:979
+#: common/models.py:1023
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:980
+#: common/models.py:1024
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:986
+#: common/models.py:1030
 msgid "Escape Key Closes Forms"
 msgstr ""
 
-#: common/models.py:987
+#: common/models.py:1031
 msgid "Use the escape key to close modal forms"
 msgstr ""
 
-#: common/models.py:1044 company/forms.py:43
+#: common/models.py:1088 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:1051 company/templates/company/supplier_part.html:231
+#: common/models.py:1095 company/templates/company/supplier_part.html:231
 #: templates/js/translated/part.js:1369
 msgid "Price"
 msgstr ""
 
-#: common/models.py:1052
+#: common/models.py:1096
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1145
+#: common/models.py:1189
 msgid "Default"
 msgstr ""
 
@@ -2593,8 +2662,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:82
 #: part/templates/part/navbar.html:85 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:229
-#: templates/InvenTree/settings/navbar.html:113
-#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:119
+#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:44
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2617,8 +2686,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:91
 #: part/templates/part/navbar.html:94 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:249
-#: templates/InvenTree/settings/navbar.html:119
-#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:55
+#: templates/InvenTree/settings/navbar.html:125
+#: templates/InvenTree/settings/navbar.html:127 templates/navbar.html:55
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2704,7 +2773,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part.html:239
 #: part/templates/part/detail.html:214 part/templates/part/detail.html:294
 #: part/templates/part/detail.html:317 templates/js/translated/company.js:424
-#: templates/js/translated/helpers.js:31 users/models.py:194
+#: templates/js/translated/helpers.js:31 users/models.py:199
 msgid "Delete"
 msgstr ""
 
@@ -2753,8 +2822,8 @@ msgstr ""
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:182
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109
 #: templates/js/translated/part.js:540 templates/js/translated/part.js:769
 #: templates/js/translated/part.js:945 templates/js/translated/stock.js:182
 #: templates/js/translated/stock.js:829 templates/navbar.html:32
@@ -3712,8 +3781,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
 #: templates/js/translated/part.js:1165 templates/navbar.html:29
 #: templates/stats.html:80 templates/stats.html:89 users/models.py:41
 msgid "Parts"
@@ -3927,7 +3996,7 @@ msgstr ""
 
 #: part/models.py:696 part/models.py:2299
 #: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:168
+#: templates/InvenTree/settings/settings.html:169
 #: templates/js/translated/part.js:927
 msgid "Category"
 msgstr ""
@@ -4117,7 +4186,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2256 part/models.py:2305 part/models.py:2306
-#: templates/InvenTree/settings/settings.html:163
+#: templates/InvenTree/settings/settings.html:164
 msgid "Parameter Template"
 msgstr ""
 
@@ -4129,7 +4198,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2310 templates/InvenTree/settings/settings.html:172
+#: part/models.py:2310 templates/InvenTree/settings/settings.html:173
 msgid "Default Value"
 msgstr ""
 
@@ -6143,6 +6212,14 @@ msgstr ""
 msgid "Setting"
 msgstr ""
 
+#: templates/InvenTree/settings/login.html:9
+msgid "Login Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/login.html:22 templates/account/signup.html:5
+msgid "Signup"
+msgstr ""
+
 #: templates/InvenTree/settings/navbar.html:12
 #: templates/InvenTree/settings/user_settings.html:9
 msgid "User Settings"
@@ -6196,22 +6273,27 @@ msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
-msgid "Barcodes"
+#: templates/InvenTree/settings/navbar.html:73 templates/navbar.html:87
+msgid "Login"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:77
 #: templates/InvenTree/settings/navbar.html:79
-msgid "Currencies"
+msgid "Barcodes"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:83
 #: templates/InvenTree/settings/navbar.html:85
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
 msgid "Reporting"
 msgstr ""
 
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103
 msgid "Categories"
 msgstr ""
 
@@ -6252,21 +6334,21 @@ msgstr ""
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:153
+#: templates/InvenTree/settings/settings.html:154
 msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:175
-#: templates/InvenTree/settings/settings.html:274
-msgid "Edit Template"
-msgstr ""
-
 #: templates/InvenTree/settings/settings.html:176
 #: templates/InvenTree/settings/settings.html:275
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/settings.html:177
+#: templates/InvenTree/settings/settings.html:276
 msgid "Delete Template"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:254
+#: templates/InvenTree/settings/settings.html:255
 msgid "No part parameter templates found"
 msgstr ""
 
@@ -6278,70 +6360,136 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:9
+#: templates/InvenTree/settings/user.html:11
 msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:15
+#: templates/InvenTree/settings/user.html:19
 #: templates/js/translated/helpers.js:26
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:17
+#: templates/InvenTree/settings/user.html:21
+#: templates/account/password_reset_from_key.html:4
+#: templates/account/password_reset_from_key.html:7
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:24
-#: templates/registration/login.html:58
+#: templates/InvenTree/settings/user.html:28
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:32
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:36
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
-msgid "Email Address"
+#: templates/InvenTree/settings/user.html:42
+msgid "E-Mail"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:42
-msgid "Theme Settings"
+#: templates/InvenTree/settings/user.html:47
+msgid "The following e-mail addresses are associated with your account:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:61
+msgid "Verified"
 msgstr ""
 
 #: templates/InvenTree/settings/user.html:63
+msgid "Unverified"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:65
+msgid "Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:71
+msgid "Make Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:72
+msgid "Re-send Verification"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:73
+#: templates/InvenTree/settings/user.html:130
+msgid "Remove"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:80
+msgid "Warning:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:81
+msgid "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."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:88
+msgid "Add E-mail Address"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:93
+msgid "Add E-mail"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:100
+msgid "Social Accounts"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:105
+msgid "You can sign in to your account using any of the following third party accounts:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:138
+msgid "You currently have no social network accounts connected to this account."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:142
+msgid "Add a 3rd Party Account"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:153
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:174
 msgid "Set Theme"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:70
+#: templates/InvenTree/settings/user.html:181
 msgid "Language Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:89
+#: templates/InvenTree/settings/user.html:200
 #, python-format
 msgid "%(lang_translated)s%% translated"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:91
+#: templates/InvenTree/settings/user.html:202
 msgid "No translations available"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:98
+#: templates/InvenTree/settings/user.html:209
 msgid "Set Language"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:103
+#: templates/InvenTree/settings/user.html:214
 msgid "Help the translation efforts!"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:104
+#: templates/InvenTree/settings/user.html:215
 #, python-format
 msgid "Native language translation of the InvenTree web application is <a href=\"%(link)s\">community contributed via crowdin</a>. Contributions are welcomed and encouraged."
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:223
+msgid "Do you really want to remove the selected e-mail address?"
+msgstr ""
+
 #: templates/InvenTree/settings/user_forms.html:9
 msgid "Form Settings"
 msgstr ""
@@ -6433,6 +6581,105 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#: templates/account/email_confirm.html:6
+#: templates/account/email_confirm.html:10
+msgid "Confirm E-mail Address"
+msgstr ""
+
+#: templates/account/email_confirm.html:16
+#, python-format
+msgid "Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail address for user %(user_display)s."
+msgstr ""
+
+#: templates/account/email_confirm.html:27
+#, python-format
+msgid "This e-mail confirmation link expired or is invalid. Please <a href=\"%(email_url)s\">issue a new e-mail confirmation request</a>."
+msgstr ""
+
+#: templates/account/login.html:5 templates/account/login.html:14
+#: templates/account/login.html:36
+msgid "Sign In"
+msgstr ""
+
+#: templates/account/login.html:19
+#, python-format
+msgid ""
+"Please sign in with one\n"
+"of your existing third party accounts or  <a class=\"btn btn-primary btn-small\" href=\"%(signup_url)s\">sign up</a>\n"
+"for a account and sign in below:"
+msgstr ""
+
+#: templates/account/login.html:23
+#, python-format
+msgid ""
+"If you have not created an account yet, then please\n"
+"<a href=\"%(signup_url)s\">sign up</a> first."
+msgstr ""
+
+#: templates/account/login.html:38
+msgid "Forgot Password?"
+msgstr ""
+
+#: templates/account/login.html:45
+msgid "or use SSO"
+msgstr ""
+
+#: templates/account/logout.html:5 templates/account/logout.html:8
+#: templates/account/logout.html:17
+msgid "Sign Out"
+msgstr ""
+
+#: templates/account/logout.html:10
+msgid "Are you sure you want to sign out?"
+msgstr ""
+
+#: templates/account/password_reset.html:5
+#: templates/account/password_reset.html:12
+msgid "Password Reset"
+msgstr ""
+
+#: templates/account/password_reset.html:18
+msgid "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it."
+msgstr ""
+
+#: templates/account/password_reset.html:23
+msgid "Reset My Password"
+msgstr ""
+
+#: templates/account/password_reset.html:27 templates/account/signup.html:36
+msgid "This function is currently disabled. Please contact an administrator."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:7
+msgid "Bad Token"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:11
+#, python-format
+msgid "The password reset link was invalid, possibly because it has already been used.  Please request a <a href=\"%(passwd_reset_url)s\">new password reset</a>."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:17
+msgid "change password"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:20
+msgid "Your password is now changed."
+msgstr ""
+
+#: templates/account/signup.html:11 templates/account/signup.html:22
+msgid "Sign Up"
+msgstr ""
+
+#: templates/account/signup.html:13
+#, python-format
+msgid "Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>."
+msgstr ""
+
+#: templates/account/signup.html:27
+msgid "Or use a SSO-provider for signup"
+msgstr ""
+
 #: templates/image_download.html:8
 msgid "Specify URL for downloading image"
 msgstr ""
@@ -7566,7 +7813,7 @@ msgstr ""
 msgid "Add Stock"
 msgstr ""
 
-#: templates/js/translated/stock.js:165 users/models.py:190
+#: templates/js/translated/stock.js:165 users/models.py:195
 msgid "Add"
 msgstr ""
 
@@ -8023,10 +8270,6 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: templates/navbar.html:87 templates/registration/login.html:89
-msgid "Login"
-msgstr ""
-
 #: templates/navbar.html:106
 msgid "About InvenTree"
 msgstr ""
@@ -8035,68 +8278,12 @@ msgstr ""
 msgid "QR data not provided"
 msgstr ""
 
-#: templates/registration/logged_out.html:50
-msgid "You have been logged out"
+#: templates/registration/logged_out.html:6
+msgid "You were logged out successfully."
 msgstr ""
 
-#: templates/registration/logged_out.html:51
-#: templates/registration/password_reset_complete.html:51
-#: templates/registration/password_reset_done.html:58
-msgid "Return to login screen"
-msgstr ""
-
-#: templates/registration/login.html:64
-msgid "Enter username"
-msgstr ""
-
-#: templates/registration/login.html:70
-msgid "Password"
-msgstr ""
-
-#: templates/registration/login.html:83
-msgid "Username / password combination is incorrect"
-msgstr ""
-
-#: templates/registration/login.html:95
-#: templates/registration/password_reset_form.html:51
-msgid "Forgotten your password?"
-msgstr ""
-
-#: templates/registration/login.html:95
-msgid "Click here to reset"
-msgstr ""
-
-#: templates/registration/password_reset_complete.html:50
-msgid "Password reset complete"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:52
-#: templates/registration/password_reset_confirm.html:56
-msgid "Change password"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:60
-msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:51
-msgid "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:54
-msgid "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:52
-msgid "Enter your email address below."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:53
-msgid "An email will be sent with password reset instructions."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:58
-msgid "Send email"
+#: templates/registration/logged_out.html:8
+msgid "Log in again"
 msgstr ""
 
 #: templates/stats.html:13
@@ -8235,34 +8422,34 @@ msgstr ""
 msgid "Important dates"
 msgstr ""
 
-#: users/models.py:177
+#: users/models.py:182
 msgid "Permission set"
 msgstr ""
 
-#: users/models.py:185
+#: users/models.py:190
 msgid "Group"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "View"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "Permission to view items"
 msgstr ""
 
-#: users/models.py:190
+#: users/models.py:195
 msgid "Permission to add items"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Change"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Permissions to edit items"
 msgstr ""
 
-#: users/models.py:194
+#: users/models.py:199
 msgid "Permission to delete items"
 msgstr ""
diff --git a/InvenTree/locale/nl/LC_MESSAGES/django.po b/InvenTree/locale/nl/LC_MESSAGES/django.po
index f2d6416770..621cc7be7d 100644
--- a/InvenTree/locale/nl/LC_MESSAGES/django.po
+++ b/InvenTree/locale/nl/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-11 01:01+0000\n"
+"POT-Creation-Date: 2021-10-11 06:21+0000\n"
 "PO-Revision-Date: 2021-09-12 13:44\n"
 "Last-Translator: \n"
 "Language-Team: Dutch\n"
@@ -33,41 +33,54 @@ msgstr "Geen overeenkomende actie gevonden"
 msgid "Enter date"
 msgstr "Voer datum in"
 
-#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:116 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:173 build/forms.py:215 order/forms.py:27
 #: order/forms.py:38 order/forms.py:49 order/forms.py:60 order/forms.py:71
-#: part/forms.py:108 templates/js/translated/forms.js:564
+#: part/forms.py:108 templates/account/email_confirm.html:20
+#: templates/js/translated/forms.js:564
 msgid "Confirm"
 msgstr "Bevestigen"
 
-#: InvenTree/forms.py:127
+#: InvenTree/forms.py:132
 msgid "Confirm delete"
 msgstr "Bevestigen verwijdering"
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:133
 msgid "Confirm item deletion"
 msgstr "Bevestig item verwijdering"
 
-#: InvenTree/forms.py:160 templates/registration/login.html:76
+#: InvenTree/forms.py:164
 msgid "Enter password"
 msgstr "Voer wachtwoord in"
 
-#: InvenTree/forms.py:161
+#: InvenTree/forms.py:165
 msgid "Enter new password"
 msgstr "Voer een nieuw wachtwoord in"
 
-#: InvenTree/forms.py:168
+#: InvenTree/forms.py:172
 msgid "Confirm password"
 msgstr "Wachtwoord bevestigen"
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:173
 msgid "Confirm new password"
 msgstr "Nieuw wachtwoord bevestigen"
 
-#: InvenTree/forms.py:201
+#: InvenTree/forms.py:205
 msgid "Select Category"
 msgstr "Categorie selecteren"
 
+#: InvenTree/forms.py:226
+msgid "E-mail (again)"
+msgstr ""
+
+#: InvenTree/forms.py:230
+msgid "E-mail address confirmation"
+msgstr ""
+
+#: InvenTree/forms.py:250
+msgid "You must type the same email each time."
+msgstr ""
+
 #: InvenTree/helpers.py:401
 #, python-brace-format
 msgid "Duplicate serial: {n}"
@@ -118,8 +131,8 @@ msgstr "Opmerking"
 msgid "File comment"
 msgstr "Bijlage opmerking"
 
-#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1011
-#: common/models.py:1012 part/models.py:2055
+#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1055
+#: common/models.py:1056 part/models.py:2055
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/translated/stock.js:1669
 msgid "User"
@@ -205,75 +218,75 @@ msgstr "Moet een geldig nummer zijn"
 msgid "Filename"
 msgstr "Bestandsnaam"
 
-#: InvenTree/settings.py:523
+#: InvenTree/settings.py:529
 msgid "German"
 msgstr "Duits"
 
-#: InvenTree/settings.py:524
+#: InvenTree/settings.py:530
 msgid "Greek"
 msgstr "Grieks"
 
-#: InvenTree/settings.py:525
+#: InvenTree/settings.py:531
 msgid "English"
 msgstr "Engels"
 
-#: InvenTree/settings.py:526
+#: InvenTree/settings.py:532
 msgid "Spanish"
 msgstr "Spaans"
 
-#: InvenTree/settings.py:527
+#: InvenTree/settings.py:533
 msgid "French"
 msgstr "Frans"
 
-#: InvenTree/settings.py:528
+#: InvenTree/settings.py:534
 msgid "Hebrew"
 msgstr "Hebreeuws"
 
-#: InvenTree/settings.py:529
+#: InvenTree/settings.py:535
 msgid "Italian"
 msgstr "Italiaans"
 
-#: InvenTree/settings.py:530
+#: InvenTree/settings.py:536
 msgid "Japanese"
 msgstr "Japans"
 
-#: InvenTree/settings.py:531
+#: InvenTree/settings.py:537
 msgid "Korean"
 msgstr "Koreaans"
 
-#: InvenTree/settings.py:532
+#: InvenTree/settings.py:538
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: InvenTree/settings.py:533
+#: InvenTree/settings.py:539
 msgid "Norwegian"
 msgstr "Noors"
 
-#: InvenTree/settings.py:534
+#: InvenTree/settings.py:540
 msgid "Polish"
 msgstr "Pools"
 
-#: InvenTree/settings.py:535
+#: InvenTree/settings.py:541
 msgid "Russian"
 msgstr "Russisch"
 
-#: InvenTree/settings.py:536
+#: InvenTree/settings.py:542
 msgid "Swedish"
 msgstr "Zweeds"
 
-#: InvenTree/settings.py:537
+#: InvenTree/settings.py:543
 msgid "Thai"
 msgstr "Thais"
 
-#: InvenTree/settings.py:538
+#: InvenTree/settings.py:544
 msgid "Turkish"
 msgstr "Turks"
 
-#: InvenTree/settings.py:539
+#: InvenTree/settings.py:545
 msgid "Vietnamese"
 msgstr "Vietnamees"
 
-#: InvenTree/settings.py:540
+#: InvenTree/settings.py:546
 msgid "Chinese"
 msgstr "Chinees"
 
@@ -458,27 +471,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:610
+#: InvenTree/views.py:616
 msgid "Delete Item"
 msgstr "Verwijder item"
 
-#: InvenTree/views.py:659
+#: InvenTree/views.py:665
 msgid "Check box to confirm item deletion"
 msgstr "Selectievakje aanvinken om de verwijdering van items te bevestigen"
 
-#: InvenTree/views.py:674 templates/InvenTree/settings/user.html:14
+#: InvenTree/views.py:680 templates/InvenTree/settings/user.html:18
 msgid "Edit User Information"
 msgstr "Gebruikersgegevens bewerken"
 
-#: InvenTree/views.py:685 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:691 templates/InvenTree/settings/user.html:22
 msgid "Set Password"
 msgstr "Wachtwoord instellen"
 
-#: InvenTree/views.py:704
+#: InvenTree/views.py:710
 msgid "Password fields must match"
 msgstr "Wachtwoordvelden komen niet overeen"
 
-#: InvenTree/views.py:910 templates/navbar.html:97
+#: InvenTree/views.py:954 templates/navbar.html:97
 msgid "System Information"
 msgstr "Systeeminformatie"
 
@@ -551,7 +564,7 @@ msgstr ""
 #: build/forms.py:48 build/forms.py:90 build/models.py:1281
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:1043
+#: build/templates/build/detail.html:34 common/models.py:1087
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:101 order/forms.py:123 order/models.py:720
 #: order/models.py:982 order/templates/order/order_wizard/match_parts.html:30
@@ -681,8 +694,8 @@ msgstr "Bouwopdracht"
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:50
 #: part/templates/part/navbar.html:53 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:171
-#: templates/InvenTree/settings/navbar.html:107
-#: templates/InvenTree/settings/navbar.html:109 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 users/models.py:44
 msgid "Build Orders"
 msgstr "Bouwopdrachten"
 
@@ -1551,7 +1564,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:308 common/models.py:843 common/models.py:1004
+#: common/models.py:308 common/models.py:887 common/models.py:1048
 msgid "Settings key (must be unique - case insensitive"
 msgstr "Instellingssleutel (moet uniek zijn - hoofdletter ongevoelig"
 
@@ -1965,196 +1978,256 @@ msgstr ""
 msgid "Enable PO functionality in InvenTree interface"
 msgstr ""
 
+#: common/models.py:836
+#, fuzzy
+#| msgid "Enter password"
+msgid "Enable password forgot"
+msgstr "Voer wachtwoord in"
+
+#: common/models.py:837
+msgid "Enable password forgot function on the login-pages"
+msgstr ""
+
+#: common/models.py:842
+msgid "Enable registration"
+msgstr ""
+
+#: common/models.py:843
+msgid "Enable self-registration for users on the login-pages"
+msgstr ""
+
+#: common/models.py:848
+msgid "Enable SSO"
+msgstr ""
+
+#: common/models.py:849
+msgid "Enable SSO on the login-pages"
+msgstr ""
+
 #: common/models.py:854
-msgid "Show starred parts"
+msgid "E-Mail required"
 msgstr ""
 
 #: common/models.py:855
-msgid "Show starred parts on the homepage"
+msgid "Require user to supply mail on signup"
 msgstr ""
 
 #: common/models.py:860
-msgid "Show latest parts"
+msgid "Auto-fill SSO users"
 msgstr ""
 
 #: common/models.py:861
-msgid "Show latest parts on the homepage"
+msgid "Automatically fill out user-details from SSO account-data"
 msgstr ""
 
 #: common/models.py:866
-msgid "Recent Part Count"
+msgid "Mail twice"
 msgstr ""
 
 #: common/models.py:867
-msgid "Number of recent parts to display on index page"
+msgid "On signup ask users twice for their mail"
 msgstr ""
 
+#: common/models.py:872
+#, fuzzy
+#| msgid "Set Password"
+msgid "Password twice"
+msgstr "Wachtwoord instellen"
+
 #: common/models.py:873
-msgid "Show unvalidated BOMs"
-msgstr ""
-
-#: common/models.py:874
-msgid "Show BOMs that await validation on the homepage"
-msgstr ""
-
-#: common/models.py:879
-msgid "Show recent stock changes"
-msgstr ""
-
-#: common/models.py:880
-msgid "Show recently changed stock items on the homepage"
-msgstr ""
-
-#: common/models.py:885
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:886
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:891
-msgid "Show low stock"
-msgstr ""
-
-#: common/models.py:892
-msgid "Show low stock items on the homepage"
-msgstr ""
-
-#: common/models.py:897
-msgid "Show depleted stock"
+msgid "On signup ask users twice for their password"
 msgstr ""
 
 #: common/models.py:898
-msgid "Show depleted stock items on the homepage"
+msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:903
-msgid "Show needed stock"
+#: common/models.py:899
+msgid "Show starred parts on the homepage"
 msgstr ""
 
 #: common/models.py:904
-msgid "Show stock items needed for builds on the homepage"
+msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:909
-msgid "Show expired stock"
+#: common/models.py:905
+msgid "Show latest parts on the homepage"
 msgstr ""
 
 #: common/models.py:910
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:911
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:917
+msgid "Show unvalidated BOMs"
+msgstr ""
+
+#: common/models.py:918
+msgid "Show BOMs that await validation on the homepage"
+msgstr ""
+
+#: common/models.py:923
+msgid "Show recent stock changes"
+msgstr ""
+
+#: common/models.py:924
+msgid "Show recently changed stock items on the homepage"
+msgstr ""
+
+#: common/models.py:929
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:930
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:935
+msgid "Show low stock"
+msgstr ""
+
+#: common/models.py:936
+msgid "Show low stock items on the homepage"
+msgstr ""
+
+#: common/models.py:941
+msgid "Show depleted stock"
+msgstr ""
+
+#: common/models.py:942
+msgid "Show depleted stock items on the homepage"
+msgstr ""
+
+#: common/models.py:947
+msgid "Show needed stock"
+msgstr ""
+
+#: common/models.py:948
+msgid "Show stock items needed for builds on the homepage"
+msgstr ""
+
+#: common/models.py:953
+msgid "Show expired stock"
+msgstr ""
+
+#: common/models.py:954
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:915
+#: common/models.py:959
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:916
+#: common/models.py:960
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:921
+#: common/models.py:965
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:922
+#: common/models.py:966
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:927
+#: common/models.py:971
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:928
+#: common/models.py:972
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:933
+#: common/models.py:977
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:934
+#: common/models.py:978
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:939
+#: common/models.py:983
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:940
+#: common/models.py:984
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:945
+#: common/models.py:989
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:946
+#: common/models.py:990
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:951
+#: common/models.py:995
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:952
+#: common/models.py:996
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:958
+#: common/models.py:1002
 msgid "Inline label display"
 msgstr ""
 
-#: common/models.py:959
+#: common/models.py:1003
 msgid "Display PDF labels in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:965
+#: common/models.py:1009
 msgid "Inline report display"
 msgstr ""
 
-#: common/models.py:966
+#: common/models.py:1010
 msgid "Display PDF reports in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:972
+#: common/models.py:1016
 msgid "Search Preview Results"
 msgstr ""
 
-#: common/models.py:973
+#: common/models.py:1017
 msgid "Number of results to show in search preview window"
 msgstr ""
 
-#: common/models.py:979
+#: common/models.py:1023
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:980
+#: common/models.py:1024
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:986
+#: common/models.py:1030
 msgid "Escape Key Closes Forms"
 msgstr ""
 
-#: common/models.py:987
+#: common/models.py:1031
 msgid "Use the escape key to close modal forms"
 msgstr ""
 
-#: common/models.py:1044 company/forms.py:43
+#: common/models.py:1088 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:1051 company/templates/company/supplier_part.html:231
+#: common/models.py:1095 company/templates/company/supplier_part.html:231
 #: templates/js/translated/part.js:1369
 msgid "Price"
 msgstr ""
 
-#: common/models.py:1052
+#: common/models.py:1096
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1145
+#: common/models.py:1189
 msgid "Default"
 msgstr ""
 
@@ -2603,8 +2676,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:82
 #: part/templates/part/navbar.html:85 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:229
-#: templates/InvenTree/settings/navbar.html:113
-#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:119
+#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:44
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2627,8 +2700,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:91
 #: part/templates/part/navbar.html:94 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:249
-#: templates/InvenTree/settings/navbar.html:119
-#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:55
+#: templates/InvenTree/settings/navbar.html:125
+#: templates/InvenTree/settings/navbar.html:127 templates/navbar.html:55
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2714,7 +2787,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part.html:239
 #: part/templates/part/detail.html:214 part/templates/part/detail.html:294
 #: part/templates/part/detail.html:317 templates/js/translated/company.js:424
-#: templates/js/translated/helpers.js:31 users/models.py:194
+#: templates/js/translated/helpers.js:31 users/models.py:199
 msgid "Delete"
 msgstr ""
 
@@ -2763,8 +2836,8 @@ msgstr ""
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:182
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109
 #: templates/js/translated/part.js:540 templates/js/translated/part.js:769
 #: templates/js/translated/part.js:945 templates/js/translated/stock.js:182
 #: templates/js/translated/stock.js:829 templates/navbar.html:32
@@ -3726,8 +3799,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
 #: templates/js/translated/part.js:1165 templates/navbar.html:29
 #: templates/stats.html:80 templates/stats.html:89 users/models.py:41
 msgid "Parts"
@@ -3941,7 +4014,7 @@ msgstr ""
 
 #: part/models.py:696 part/models.py:2299
 #: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:168
+#: templates/InvenTree/settings/settings.html:169
 #: templates/js/translated/part.js:927
 msgid "Category"
 msgstr ""
@@ -4131,7 +4204,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2256 part/models.py:2305 part/models.py:2306
-#: templates/InvenTree/settings/settings.html:163
+#: templates/InvenTree/settings/settings.html:164
 msgid "Parameter Template"
 msgstr ""
 
@@ -4143,7 +4216,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2310 templates/InvenTree/settings/settings.html:172
+#: part/models.py:2310 templates/InvenTree/settings/settings.html:173
 msgid "Default Value"
 msgstr ""
 
@@ -6159,6 +6232,14 @@ msgstr ""
 msgid "Setting"
 msgstr ""
 
+#: templates/InvenTree/settings/login.html:9
+msgid "Login Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/login.html:22 templates/account/signup.html:5
+msgid "Signup"
+msgstr ""
+
 #: templates/InvenTree/settings/navbar.html:12
 #: templates/InvenTree/settings/user_settings.html:9
 msgid "User Settings"
@@ -6212,22 +6293,27 @@ msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
-msgid "Barcodes"
+#: templates/InvenTree/settings/navbar.html:73 templates/navbar.html:87
+msgid "Login"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:77
 #: templates/InvenTree/settings/navbar.html:79
-msgid "Currencies"
+msgid "Barcodes"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:83
 #: templates/InvenTree/settings/navbar.html:85
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
 msgid "Reporting"
 msgstr ""
 
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103
 msgid "Categories"
 msgstr ""
 
@@ -6268,21 +6354,21 @@ msgstr ""
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:153
+#: templates/InvenTree/settings/settings.html:154
 msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:175
-#: templates/InvenTree/settings/settings.html:274
-msgid "Edit Template"
-msgstr ""
-
 #: templates/InvenTree/settings/settings.html:176
 #: templates/InvenTree/settings/settings.html:275
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/settings.html:177
+#: templates/InvenTree/settings/settings.html:276
 msgid "Delete Template"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:254
+#: templates/InvenTree/settings/settings.html:255
 msgid "No part parameter templates found"
 msgstr ""
 
@@ -6294,70 +6380,138 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:9
+#: templates/InvenTree/settings/user.html:11
 msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:15
+#: templates/InvenTree/settings/user.html:19
 #: templates/js/translated/helpers.js:26
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:17
+#: templates/InvenTree/settings/user.html:21
+#: templates/account/password_reset_from_key.html:4
+#: templates/account/password_reset_from_key.html:7
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:24
-#: templates/registration/login.html:58
+#: templates/InvenTree/settings/user.html:28
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:32
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:36
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
-msgid "Email Address"
+#: templates/InvenTree/settings/user.html:42
+msgid "E-Mail"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:42
-msgid "Theme Settings"
+#: templates/InvenTree/settings/user.html:47
+msgid "The following e-mail addresses are associated with your account:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:61
+msgid "Verified"
 msgstr ""
 
 #: templates/InvenTree/settings/user.html:63
+msgid "Unverified"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:65
+msgid "Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:71
+msgid "Make Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:72
+msgid "Re-send Verification"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:73
+#: templates/InvenTree/settings/user.html:130
+msgid "Remove"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:80
+msgid "Warning:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:81
+msgid "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."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:88
+msgid "Add E-mail Address"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:93
+msgid "Add E-mail"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:100
+#, fuzzy
+#| msgid "Stock counted"
+msgid "Social Accounts"
+msgstr "Voorraad geteld"
+
+#: templates/InvenTree/settings/user.html:105
+msgid "You can sign in to your account using any of the following third party accounts:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:138
+msgid "You currently have no social network accounts connected to this account."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:142
+msgid "Add a 3rd Party Account"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:153
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:174
 msgid "Set Theme"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:70
+#: templates/InvenTree/settings/user.html:181
 msgid "Language Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:89
+#: templates/InvenTree/settings/user.html:200
 #, python-format
 msgid "%(lang_translated)s%% translated"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:91
+#: templates/InvenTree/settings/user.html:202
 msgid "No translations available"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:98
+#: templates/InvenTree/settings/user.html:209
 msgid "Set Language"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:103
+#: templates/InvenTree/settings/user.html:214
 msgid "Help the translation efforts!"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:104
+#: templates/InvenTree/settings/user.html:215
 #, python-format
 msgid "Native language translation of the InvenTree web application is <a href=\"%(link)s\">community contributed via crowdin</a>. Contributions are welcomed and encouraged."
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:223
+msgid "Do you really want to remove the selected e-mail address?"
+msgstr ""
+
 #: templates/InvenTree/settings/user_forms.html:9
 msgid "Form Settings"
 msgstr ""
@@ -6449,6 +6603,115 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#: templates/account/email_confirm.html:6
+#: templates/account/email_confirm.html:10
+msgid "Confirm E-mail Address"
+msgstr ""
+
+#: templates/account/email_confirm.html:16
+#, python-format
+msgid "Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail address for user %(user_display)s."
+msgstr ""
+
+#: templates/account/email_confirm.html:27
+#, python-format
+msgid "This e-mail confirmation link expired or is invalid. Please <a href=\"%(email_url)s\">issue a new e-mail confirmation request</a>."
+msgstr ""
+
+#: templates/account/login.html:5 templates/account/login.html:14
+#: templates/account/login.html:36
+msgid "Sign In"
+msgstr ""
+
+#: templates/account/login.html:19
+#, python-format
+msgid ""
+"Please sign in with one\n"
+"of your existing third party accounts or  <a class=\"btn btn-primary btn-small\" href=\"%(signup_url)s\">sign up</a>\n"
+"for a account and sign in below:"
+msgstr ""
+
+#: templates/account/login.html:23
+#, python-format
+msgid ""
+"If you have not created an account yet, then please\n"
+"<a href=\"%(signup_url)s\">sign up</a> first."
+msgstr ""
+
+#: templates/account/login.html:38
+#, fuzzy
+#| msgid "Set Password"
+msgid "Forgot Password?"
+msgstr "Wachtwoord instellen"
+
+#: templates/account/login.html:45
+msgid "or use SSO"
+msgstr ""
+
+#: templates/account/logout.html:5 templates/account/logout.html:8
+#: templates/account/logout.html:17
+msgid "Sign Out"
+msgstr ""
+
+#: templates/account/logout.html:10
+#, fuzzy
+#| msgid "Are you sure you wish to cancel this build?"
+msgid "Are you sure you want to sign out?"
+msgstr "Weet je zeker dat je de bouw wilt annuleren?"
+
+#: templates/account/password_reset.html:5
+#: templates/account/password_reset.html:12
+#, fuzzy
+#| msgid "Set Password"
+msgid "Password Reset"
+msgstr "Wachtwoord instellen"
+
+#: templates/account/password_reset.html:18
+msgid "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it."
+msgstr ""
+
+#: templates/account/password_reset.html:23
+#, fuzzy
+#| msgid "Set Password"
+msgid "Reset My Password"
+msgstr "Wachtwoord instellen"
+
+#: templates/account/password_reset.html:27 templates/account/signup.html:36
+msgid "This function is currently disabled. Please contact an administrator."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:7
+msgid "Bad Token"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:11
+#, python-format
+msgid "The password reset link was invalid, possibly because it has already been used.  Please request a <a href=\"%(passwd_reset_url)s\">new password reset</a>."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:17
+#, fuzzy
+#| msgid "Enter password"
+msgid "change password"
+msgstr "Voer wachtwoord in"
+
+#: templates/account/password_reset_from_key.html:20
+msgid "Your password is now changed."
+msgstr ""
+
+#: templates/account/signup.html:11 templates/account/signup.html:22
+msgid "Sign Up"
+msgstr ""
+
+#: templates/account/signup.html:13
+#, python-format
+msgid "Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>."
+msgstr ""
+
+#: templates/account/signup.html:27
+msgid "Or use a SSO-provider for signup"
+msgstr ""
+
 #: templates/image_download.html:8
 msgid "Specify URL for downloading image"
 msgstr ""
@@ -7618,7 +7881,7 @@ msgstr ""
 msgid "Add Stock"
 msgstr ""
 
-#: templates/js/translated/stock.js:165 users/models.py:190
+#: templates/js/translated/stock.js:165 users/models.py:195
 msgid "Add"
 msgstr ""
 
@@ -8075,10 +8338,6 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: templates/navbar.html:87 templates/registration/login.html:89
-msgid "Login"
-msgstr ""
-
 #: templates/navbar.html:106
 msgid "About InvenTree"
 msgstr ""
@@ -8087,68 +8346,12 @@ msgstr ""
 msgid "QR data not provided"
 msgstr ""
 
-#: templates/registration/logged_out.html:50
-msgid "You have been logged out"
+#: templates/registration/logged_out.html:6
+msgid "You were logged out successfully."
 msgstr ""
 
-#: templates/registration/logged_out.html:51
-#: templates/registration/password_reset_complete.html:51
-#: templates/registration/password_reset_done.html:58
-msgid "Return to login screen"
-msgstr ""
-
-#: templates/registration/login.html:64
-msgid "Enter username"
-msgstr ""
-
-#: templates/registration/login.html:70
-msgid "Password"
-msgstr ""
-
-#: templates/registration/login.html:83
-msgid "Username / password combination is incorrect"
-msgstr ""
-
-#: templates/registration/login.html:95
-#: templates/registration/password_reset_form.html:51
-msgid "Forgotten your password?"
-msgstr ""
-
-#: templates/registration/login.html:95
-msgid "Click here to reset"
-msgstr ""
-
-#: templates/registration/password_reset_complete.html:50
-msgid "Password reset complete"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:52
-#: templates/registration/password_reset_confirm.html:56
-msgid "Change password"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:60
-msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:51
-msgid "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:54
-msgid "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:52
-msgid "Enter your email address below."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:53
-msgid "An email will be sent with password reset instructions."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:58
-msgid "Send email"
+#: templates/registration/logged_out.html:8
+msgid "Log in again"
 msgstr ""
 
 #: templates/stats.html:13
@@ -8287,35 +8490,35 @@ msgstr ""
 msgid "Important dates"
 msgstr ""
 
-#: users/models.py:177
+#: users/models.py:182
 msgid "Permission set"
 msgstr ""
 
-#: users/models.py:185
+#: users/models.py:190
 msgid "Group"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "View"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "Permission to view items"
 msgstr ""
 
-#: users/models.py:190
+#: users/models.py:195
 msgid "Permission to add items"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Change"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Permissions to edit items"
 msgstr ""
 
-#: users/models.py:194
+#: users/models.py:199
 msgid "Permission to delete items"
 msgstr ""
 
diff --git a/InvenTree/locale/no/LC_MESSAGES/django.po b/InvenTree/locale/no/LC_MESSAGES/django.po
index ab54a3081b..47c854662b 100644
--- a/InvenTree/locale/no/LC_MESSAGES/django.po
+++ b/InvenTree/locale/no/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-11 01:01+0000\n"
+"POT-Creation-Date: 2021-10-11 06:21+0000\n"
 "PO-Revision-Date: 2021-09-12 13:44\n"
 "Last-Translator: \n"
 "Language-Team: Norwegian\n"
@@ -33,41 +33,54 @@ msgstr "Ingen samsvarende handling funnet"
 msgid "Enter date"
 msgstr "Oppgi dato"
 
-#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:116 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:173 build/forms.py:215 order/forms.py:27
 #: order/forms.py:38 order/forms.py:49 order/forms.py:60 order/forms.py:71
-#: part/forms.py:108 templates/js/translated/forms.js:564
+#: part/forms.py:108 templates/account/email_confirm.html:20
+#: templates/js/translated/forms.js:564
 msgid "Confirm"
 msgstr "Bekreft"
 
-#: InvenTree/forms.py:127
+#: InvenTree/forms.py:132
 msgid "Confirm delete"
 msgstr "Bekreft sletting"
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:133
 msgid "Confirm item deletion"
 msgstr ""
 
-#: InvenTree/forms.py:160 templates/registration/login.html:76
+#: InvenTree/forms.py:164
 msgid "Enter password"
 msgstr "Oppgi passord"
 
-#: InvenTree/forms.py:161
+#: InvenTree/forms.py:165
 msgid "Enter new password"
 msgstr "Oppgi nytt passord"
 
-#: InvenTree/forms.py:168
+#: InvenTree/forms.py:172
 msgid "Confirm password"
 msgstr "Bekreft passord"
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:173
 msgid "Confirm new password"
 msgstr "Bekreft nytt passord"
 
-#: InvenTree/forms.py:201
+#: InvenTree/forms.py:205
 msgid "Select Category"
 msgstr "Velg kategori"
 
+#: InvenTree/forms.py:226
+msgid "E-mail (again)"
+msgstr ""
+
+#: InvenTree/forms.py:230
+msgid "E-mail address confirmation"
+msgstr ""
+
+#: InvenTree/forms.py:250
+msgid "You must type the same email each time."
+msgstr ""
+
 #: InvenTree/helpers.py:401
 #, python-brace-format
 msgid "Duplicate serial: {n}"
@@ -118,8 +131,8 @@ msgstr "Kommenter"
 msgid "File comment"
 msgstr "Kommentar til fil"
 
-#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1011
-#: common/models.py:1012 part/models.py:2055
+#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1055
+#: common/models.py:1056 part/models.py:2055
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/translated/stock.js:1669
 msgid "User"
@@ -205,75 +218,75 @@ msgstr "Nummer må være gyldig"
 msgid "Filename"
 msgstr ""
 
-#: InvenTree/settings.py:523
+#: InvenTree/settings.py:529
 msgid "German"
 msgstr "Tysk"
 
-#: InvenTree/settings.py:524
+#: InvenTree/settings.py:530
 msgid "Greek"
 msgstr "Gresk"
 
-#: InvenTree/settings.py:525
+#: InvenTree/settings.py:531
 msgid "English"
 msgstr "Engelsk"
 
-#: InvenTree/settings.py:526
+#: InvenTree/settings.py:532
 msgid "Spanish"
 msgstr "Spansk"
 
-#: InvenTree/settings.py:527
+#: InvenTree/settings.py:533
 msgid "French"
 msgstr "Fransk"
 
-#: InvenTree/settings.py:528
+#: InvenTree/settings.py:534
 msgid "Hebrew"
 msgstr "Hebraisk"
 
-#: InvenTree/settings.py:529
+#: InvenTree/settings.py:535
 msgid "Italian"
 msgstr "Italiensk"
 
-#: InvenTree/settings.py:530
+#: InvenTree/settings.py:536
 msgid "Japanese"
 msgstr "Japansk"
 
-#: InvenTree/settings.py:531
+#: InvenTree/settings.py:537
 msgid "Korean"
 msgstr "Koreansk"
 
-#: InvenTree/settings.py:532
+#: InvenTree/settings.py:538
 msgid "Dutch"
 msgstr "Nederlandsk"
 
-#: InvenTree/settings.py:533
+#: InvenTree/settings.py:539
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: InvenTree/settings.py:534
+#: InvenTree/settings.py:540
 msgid "Polish"
 msgstr "Polsk"
 
-#: InvenTree/settings.py:535
+#: InvenTree/settings.py:541
 msgid "Russian"
 msgstr "Russisk"
 
-#: InvenTree/settings.py:536
+#: InvenTree/settings.py:542
 msgid "Swedish"
 msgstr "Svensk"
 
-#: InvenTree/settings.py:537
+#: InvenTree/settings.py:543
 msgid "Thai"
 msgstr "Thailandsk"
 
-#: InvenTree/settings.py:538
+#: InvenTree/settings.py:544
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: InvenTree/settings.py:539
+#: InvenTree/settings.py:545
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
-#: InvenTree/settings.py:540
+#: InvenTree/settings.py:546
 msgid "Chinese"
 msgstr "Kinesisk"
 
@@ -458,27 +471,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:610
+#: InvenTree/views.py:616
 msgid "Delete Item"
 msgstr ""
 
-#: InvenTree/views.py:659
+#: InvenTree/views.py:665
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:674 templates/InvenTree/settings/user.html:14
+#: InvenTree/views.py:680 templates/InvenTree/settings/user.html:18
 msgid "Edit User Information"
 msgstr ""
 
-#: InvenTree/views.py:685 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:691 templates/InvenTree/settings/user.html:22
 msgid "Set Password"
 msgstr ""
 
-#: InvenTree/views.py:704
+#: InvenTree/views.py:710
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:910 templates/navbar.html:97
+#: InvenTree/views.py:954 templates/navbar.html:97
 msgid "System Information"
 msgstr ""
 
@@ -551,7 +564,7 @@ msgstr ""
 #: build/forms.py:48 build/forms.py:90 build/models.py:1281
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:1043
+#: build/templates/build/detail.html:34 common/models.py:1087
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:101 order/forms.py:123 order/models.py:720
 #: order/models.py:982 order/templates/order/order_wizard/match_parts.html:30
@@ -681,8 +694,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:50
 #: part/templates/part/navbar.html:53 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:171
-#: templates/InvenTree/settings/navbar.html:107
-#: templates/InvenTree/settings/navbar.html:109 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1541,7 +1554,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:308 common/models.py:843 common/models.py:1004
+#: common/models.py:308 common/models.py:887 common/models.py:1048
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1955,196 +1968,254 @@ msgstr ""
 msgid "Enable PO functionality in InvenTree interface"
 msgstr ""
 
+#: common/models.py:836
+#, fuzzy
+#| msgid "Enter password"
+msgid "Enable password forgot"
+msgstr "Oppgi passord"
+
+#: common/models.py:837
+msgid "Enable password forgot function on the login-pages"
+msgstr ""
+
+#: common/models.py:842
+msgid "Enable registration"
+msgstr ""
+
+#: common/models.py:843
+msgid "Enable self-registration for users on the login-pages"
+msgstr ""
+
+#: common/models.py:848
+msgid "Enable SSO"
+msgstr ""
+
+#: common/models.py:849
+msgid "Enable SSO on the login-pages"
+msgstr ""
+
 #: common/models.py:854
-msgid "Show starred parts"
+msgid "E-Mail required"
 msgstr ""
 
 #: common/models.py:855
-msgid "Show starred parts on the homepage"
+msgid "Require user to supply mail on signup"
 msgstr ""
 
 #: common/models.py:860
-msgid "Show latest parts"
+msgid "Auto-fill SSO users"
 msgstr ""
 
 #: common/models.py:861
-msgid "Show latest parts on the homepage"
+msgid "Automatically fill out user-details from SSO account-data"
 msgstr ""
 
 #: common/models.py:866
-msgid "Recent Part Count"
+msgid "Mail twice"
 msgstr ""
 
 #: common/models.py:867
-msgid "Number of recent parts to display on index page"
+msgid "On signup ask users twice for their mail"
+msgstr ""
+
+#: common/models.py:872
+msgid "Password twice"
 msgstr ""
 
 #: common/models.py:873
-msgid "Show unvalidated BOMs"
-msgstr ""
-
-#: common/models.py:874
-msgid "Show BOMs that await validation on the homepage"
-msgstr ""
-
-#: common/models.py:879
-msgid "Show recent stock changes"
-msgstr ""
-
-#: common/models.py:880
-msgid "Show recently changed stock items on the homepage"
-msgstr ""
-
-#: common/models.py:885
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:886
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:891
-msgid "Show low stock"
-msgstr ""
-
-#: common/models.py:892
-msgid "Show low stock items on the homepage"
-msgstr ""
-
-#: common/models.py:897
-msgid "Show depleted stock"
+msgid "On signup ask users twice for their password"
 msgstr ""
 
 #: common/models.py:898
-msgid "Show depleted stock items on the homepage"
+msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:903
-msgid "Show needed stock"
+#: common/models.py:899
+msgid "Show starred parts on the homepage"
 msgstr ""
 
 #: common/models.py:904
-msgid "Show stock items needed for builds on the homepage"
+msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:909
-msgid "Show expired stock"
+#: common/models.py:905
+msgid "Show latest parts on the homepage"
 msgstr ""
 
 #: common/models.py:910
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:911
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:917
+msgid "Show unvalidated BOMs"
+msgstr ""
+
+#: common/models.py:918
+msgid "Show BOMs that await validation on the homepage"
+msgstr ""
+
+#: common/models.py:923
+msgid "Show recent stock changes"
+msgstr ""
+
+#: common/models.py:924
+msgid "Show recently changed stock items on the homepage"
+msgstr ""
+
+#: common/models.py:929
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:930
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:935
+msgid "Show low stock"
+msgstr ""
+
+#: common/models.py:936
+msgid "Show low stock items on the homepage"
+msgstr ""
+
+#: common/models.py:941
+msgid "Show depleted stock"
+msgstr ""
+
+#: common/models.py:942
+msgid "Show depleted stock items on the homepage"
+msgstr ""
+
+#: common/models.py:947
+msgid "Show needed stock"
+msgstr ""
+
+#: common/models.py:948
+msgid "Show stock items needed for builds on the homepage"
+msgstr ""
+
+#: common/models.py:953
+msgid "Show expired stock"
+msgstr ""
+
+#: common/models.py:954
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:915
+#: common/models.py:959
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:916
+#: common/models.py:960
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:921
+#: common/models.py:965
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:922
+#: common/models.py:966
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:927
+#: common/models.py:971
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:928
+#: common/models.py:972
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:933
+#: common/models.py:977
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:934
+#: common/models.py:978
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:939
+#: common/models.py:983
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:940
+#: common/models.py:984
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:945
+#: common/models.py:989
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:946
+#: common/models.py:990
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:951
+#: common/models.py:995
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:952
+#: common/models.py:996
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:958
+#: common/models.py:1002
 msgid "Inline label display"
 msgstr ""
 
-#: common/models.py:959
+#: common/models.py:1003
 msgid "Display PDF labels in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:965
+#: common/models.py:1009
 msgid "Inline report display"
 msgstr ""
 
-#: common/models.py:966
+#: common/models.py:1010
 msgid "Display PDF reports in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:972
+#: common/models.py:1016
 msgid "Search Preview Results"
 msgstr ""
 
-#: common/models.py:973
+#: common/models.py:1017
 msgid "Number of results to show in search preview window"
 msgstr ""
 
-#: common/models.py:979
+#: common/models.py:1023
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:980
+#: common/models.py:1024
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:986
+#: common/models.py:1030
 msgid "Escape Key Closes Forms"
 msgstr ""
 
-#: common/models.py:987
+#: common/models.py:1031
 msgid "Use the escape key to close modal forms"
 msgstr ""
 
-#: common/models.py:1044 company/forms.py:43
+#: common/models.py:1088 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:1051 company/templates/company/supplier_part.html:231
+#: common/models.py:1095 company/templates/company/supplier_part.html:231
 #: templates/js/translated/part.js:1369
 msgid "Price"
 msgstr ""
 
-#: common/models.py:1052
+#: common/models.py:1096
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1145
+#: common/models.py:1189
 msgid "Default"
 msgstr ""
 
@@ -2593,8 +2664,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:82
 #: part/templates/part/navbar.html:85 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:229
-#: templates/InvenTree/settings/navbar.html:113
-#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:119
+#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:44
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2617,8 +2688,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:91
 #: part/templates/part/navbar.html:94 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:249
-#: templates/InvenTree/settings/navbar.html:119
-#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:55
+#: templates/InvenTree/settings/navbar.html:125
+#: templates/InvenTree/settings/navbar.html:127 templates/navbar.html:55
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2704,7 +2775,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part.html:239
 #: part/templates/part/detail.html:214 part/templates/part/detail.html:294
 #: part/templates/part/detail.html:317 templates/js/translated/company.js:424
-#: templates/js/translated/helpers.js:31 users/models.py:194
+#: templates/js/translated/helpers.js:31 users/models.py:199
 msgid "Delete"
 msgstr ""
 
@@ -2753,8 +2824,8 @@ msgstr ""
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:182
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109
 #: templates/js/translated/part.js:540 templates/js/translated/part.js:769
 #: templates/js/translated/part.js:945 templates/js/translated/stock.js:182
 #: templates/js/translated/stock.js:829 templates/navbar.html:32
@@ -3712,8 +3783,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
 #: templates/js/translated/part.js:1165 templates/navbar.html:29
 #: templates/stats.html:80 templates/stats.html:89 users/models.py:41
 msgid "Parts"
@@ -3927,7 +3998,7 @@ msgstr ""
 
 #: part/models.py:696 part/models.py:2299
 #: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:168
+#: templates/InvenTree/settings/settings.html:169
 #: templates/js/translated/part.js:927
 msgid "Category"
 msgstr ""
@@ -4117,7 +4188,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2256 part/models.py:2305 part/models.py:2306
-#: templates/InvenTree/settings/settings.html:163
+#: templates/InvenTree/settings/settings.html:164
 msgid "Parameter Template"
 msgstr ""
 
@@ -4129,7 +4200,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2310 templates/InvenTree/settings/settings.html:172
+#: part/models.py:2310 templates/InvenTree/settings/settings.html:173
 msgid "Default Value"
 msgstr ""
 
@@ -6145,6 +6216,14 @@ msgstr ""
 msgid "Setting"
 msgstr ""
 
+#: templates/InvenTree/settings/login.html:9
+msgid "Login Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/login.html:22 templates/account/signup.html:5
+msgid "Signup"
+msgstr ""
+
 #: templates/InvenTree/settings/navbar.html:12
 #: templates/InvenTree/settings/user_settings.html:9
 msgid "User Settings"
@@ -6198,22 +6277,27 @@ msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
-msgid "Barcodes"
+#: templates/InvenTree/settings/navbar.html:73 templates/navbar.html:87
+msgid "Login"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:77
 #: templates/InvenTree/settings/navbar.html:79
-msgid "Currencies"
+msgid "Barcodes"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:83
 #: templates/InvenTree/settings/navbar.html:85
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
 msgid "Reporting"
 msgstr ""
 
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103
 msgid "Categories"
 msgstr ""
 
@@ -6254,21 +6338,21 @@ msgstr ""
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:153
+#: templates/InvenTree/settings/settings.html:154
 msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:175
-#: templates/InvenTree/settings/settings.html:274
-msgid "Edit Template"
-msgstr ""
-
 #: templates/InvenTree/settings/settings.html:176
 #: templates/InvenTree/settings/settings.html:275
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/settings.html:177
+#: templates/InvenTree/settings/settings.html:276
 msgid "Delete Template"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:254
+#: templates/InvenTree/settings/settings.html:255
 msgid "No part parameter templates found"
 msgstr ""
 
@@ -6280,70 +6364,136 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:9
+#: templates/InvenTree/settings/user.html:11
 msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:15
+#: templates/InvenTree/settings/user.html:19
 #: templates/js/translated/helpers.js:26
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:17
+#: templates/InvenTree/settings/user.html:21
+#: templates/account/password_reset_from_key.html:4
+#: templates/account/password_reset_from_key.html:7
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:24
-#: templates/registration/login.html:58
+#: templates/InvenTree/settings/user.html:28
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:32
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:36
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
-msgid "Email Address"
+#: templates/InvenTree/settings/user.html:42
+msgid "E-Mail"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:42
-msgid "Theme Settings"
+#: templates/InvenTree/settings/user.html:47
+msgid "The following e-mail addresses are associated with your account:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:61
+msgid "Verified"
 msgstr ""
 
 #: templates/InvenTree/settings/user.html:63
+msgid "Unverified"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:65
+msgid "Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:71
+msgid "Make Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:72
+msgid "Re-send Verification"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:73
+#: templates/InvenTree/settings/user.html:130
+msgid "Remove"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:80
+msgid "Warning:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:81
+msgid "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."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:88
+msgid "Add E-mail Address"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:93
+msgid "Add E-mail"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:100
+msgid "Social Accounts"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:105
+msgid "You can sign in to your account using any of the following third party accounts:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:138
+msgid "You currently have no social network accounts connected to this account."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:142
+msgid "Add a 3rd Party Account"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:153
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:174
 msgid "Set Theme"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:70
+#: templates/InvenTree/settings/user.html:181
 msgid "Language Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:89
+#: templates/InvenTree/settings/user.html:200
 #, python-format
 msgid "%(lang_translated)s%% translated"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:91
+#: templates/InvenTree/settings/user.html:202
 msgid "No translations available"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:98
+#: templates/InvenTree/settings/user.html:209
 msgid "Set Language"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:103
+#: templates/InvenTree/settings/user.html:214
 msgid "Help the translation efforts!"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:104
+#: templates/InvenTree/settings/user.html:215
 #, python-format
 msgid "Native language translation of the InvenTree web application is <a href=\"%(link)s\">community contributed via crowdin</a>. Contributions are welcomed and encouraged."
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:223
+msgid "Do you really want to remove the selected e-mail address?"
+msgstr ""
+
 #: templates/InvenTree/settings/user_forms.html:9
 msgid "Form Settings"
 msgstr ""
@@ -6435,6 +6585,109 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#: templates/account/email_confirm.html:6
+#: templates/account/email_confirm.html:10
+msgid "Confirm E-mail Address"
+msgstr ""
+
+#: templates/account/email_confirm.html:16
+#, python-format
+msgid "Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail address for user %(user_display)s."
+msgstr ""
+
+#: templates/account/email_confirm.html:27
+#, python-format
+msgid "This e-mail confirmation link expired or is invalid. Please <a href=\"%(email_url)s\">issue a new e-mail confirmation request</a>."
+msgstr ""
+
+#: templates/account/login.html:5 templates/account/login.html:14
+#: templates/account/login.html:36
+msgid "Sign In"
+msgstr ""
+
+#: templates/account/login.html:19
+#, python-format
+msgid ""
+"Please sign in with one\n"
+"of your existing third party accounts or  <a class=\"btn btn-primary btn-small\" href=\"%(signup_url)s\">sign up</a>\n"
+"for a account and sign in below:"
+msgstr ""
+
+#: templates/account/login.html:23
+#, python-format
+msgid ""
+"If you have not created an account yet, then please\n"
+"<a href=\"%(signup_url)s\">sign up</a> first."
+msgstr ""
+
+#: templates/account/login.html:38
+#, fuzzy
+#| msgid "Confirm password"
+msgid "Forgot Password?"
+msgstr "Bekreft passord"
+
+#: templates/account/login.html:45
+msgid "or use SSO"
+msgstr ""
+
+#: templates/account/logout.html:5 templates/account/logout.html:8
+#: templates/account/logout.html:17
+msgid "Sign Out"
+msgstr ""
+
+#: templates/account/logout.html:10
+msgid "Are you sure you want to sign out?"
+msgstr ""
+
+#: templates/account/password_reset.html:5
+#: templates/account/password_reset.html:12
+msgid "Password Reset"
+msgstr ""
+
+#: templates/account/password_reset.html:18
+msgid "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it."
+msgstr ""
+
+#: templates/account/password_reset.html:23
+msgid "Reset My Password"
+msgstr ""
+
+#: templates/account/password_reset.html:27 templates/account/signup.html:36
+msgid "This function is currently disabled. Please contact an administrator."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:7
+msgid "Bad Token"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:11
+#, python-format
+msgid "The password reset link was invalid, possibly because it has already been used.  Please request a <a href=\"%(passwd_reset_url)s\">new password reset</a>."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:17
+#, fuzzy
+#| msgid "Enter password"
+msgid "change password"
+msgstr "Oppgi passord"
+
+#: templates/account/password_reset_from_key.html:20
+msgid "Your password is now changed."
+msgstr ""
+
+#: templates/account/signup.html:11 templates/account/signup.html:22
+msgid "Sign Up"
+msgstr ""
+
+#: templates/account/signup.html:13
+#, python-format
+msgid "Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>."
+msgstr ""
+
+#: templates/account/signup.html:27
+msgid "Or use a SSO-provider for signup"
+msgstr ""
+
 #: templates/image_download.html:8
 msgid "Specify URL for downloading image"
 msgstr ""
@@ -7582,7 +7835,7 @@ msgstr ""
 msgid "Add Stock"
 msgstr ""
 
-#: templates/js/translated/stock.js:165 users/models.py:190
+#: templates/js/translated/stock.js:165 users/models.py:195
 msgid "Add"
 msgstr ""
 
@@ -8039,10 +8292,6 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: templates/navbar.html:87 templates/registration/login.html:89
-msgid "Login"
-msgstr ""
-
 #: templates/navbar.html:106
 msgid "About InvenTree"
 msgstr ""
@@ -8051,68 +8300,12 @@ msgstr ""
 msgid "QR data not provided"
 msgstr ""
 
-#: templates/registration/logged_out.html:50
-msgid "You have been logged out"
+#: templates/registration/logged_out.html:6
+msgid "You were logged out successfully."
 msgstr ""
 
-#: templates/registration/logged_out.html:51
-#: templates/registration/password_reset_complete.html:51
-#: templates/registration/password_reset_done.html:58
-msgid "Return to login screen"
-msgstr ""
-
-#: templates/registration/login.html:64
-msgid "Enter username"
-msgstr ""
-
-#: templates/registration/login.html:70
-msgid "Password"
-msgstr ""
-
-#: templates/registration/login.html:83
-msgid "Username / password combination is incorrect"
-msgstr ""
-
-#: templates/registration/login.html:95
-#: templates/registration/password_reset_form.html:51
-msgid "Forgotten your password?"
-msgstr ""
-
-#: templates/registration/login.html:95
-msgid "Click here to reset"
-msgstr ""
-
-#: templates/registration/password_reset_complete.html:50
-msgid "Password reset complete"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:52
-#: templates/registration/password_reset_confirm.html:56
-msgid "Change password"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:60
-msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:51
-msgid "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:54
-msgid "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:52
-msgid "Enter your email address below."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:53
-msgid "An email will be sent with password reset instructions."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:58
-msgid "Send email"
+#: templates/registration/logged_out.html:8
+msgid "Log in again"
 msgstr ""
 
 #: templates/stats.html:13
@@ -8251,34 +8444,34 @@ msgstr ""
 msgid "Important dates"
 msgstr ""
 
-#: users/models.py:177
+#: users/models.py:182
 msgid "Permission set"
 msgstr ""
 
-#: users/models.py:185
+#: users/models.py:190
 msgid "Group"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "View"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "Permission to view items"
 msgstr ""
 
-#: users/models.py:190
+#: users/models.py:195
 msgid "Permission to add items"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Change"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Permissions to edit items"
 msgstr ""
 
-#: users/models.py:194
+#: users/models.py:199
 msgid "Permission to delete items"
 msgstr ""
diff --git a/InvenTree/locale/pl/LC_MESSAGES/django.po b/InvenTree/locale/pl/LC_MESSAGES/django.po
index 1c9adf17a8..a2991b500c 100644
--- a/InvenTree/locale/pl/LC_MESSAGES/django.po
+++ b/InvenTree/locale/pl/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-11 01:01+0000\n"
+"POT-Creation-Date: 2021-10-11 06:21+0000\n"
 "PO-Revision-Date: 2021-09-12 13:44\n"
 "Last-Translator: \n"
 "Language-Team: Polish\n"
@@ -33,41 +33,56 @@ msgstr "Nie znaleziono pasującej akcji"
 msgid "Enter date"
 msgstr "Wprowadź dane"
 
-#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:116 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:173 build/forms.py:215 order/forms.py:27
 #: order/forms.py:38 order/forms.py:49 order/forms.py:60 order/forms.py:71
-#: part/forms.py:108 templates/js/translated/forms.js:564
+#: part/forms.py:108 templates/account/email_confirm.html:20
+#: templates/js/translated/forms.js:564
 msgid "Confirm"
 msgstr "Potwierdź"
 
-#: InvenTree/forms.py:127
+#: InvenTree/forms.py:132
 msgid "Confirm delete"
 msgstr "Potwierdź usunięcie"
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:133
 msgid "Confirm item deletion"
 msgstr "Potwierdź usuwanie elementu"
 
-#: InvenTree/forms.py:160 templates/registration/login.html:76
+#: InvenTree/forms.py:164
 msgid "Enter password"
 msgstr "Wprowadź hasło"
 
-#: InvenTree/forms.py:161
+#: InvenTree/forms.py:165
 msgid "Enter new password"
 msgstr "Wprowadź nowe hasło"
 
-#: InvenTree/forms.py:168
+#: InvenTree/forms.py:172
 msgid "Confirm password"
 msgstr "Potwierdź hasło"
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:173
 msgid "Confirm new password"
 msgstr "Potwierdź nowe hasło"
 
-#: InvenTree/forms.py:201
+#: InvenTree/forms.py:205
 msgid "Select Category"
 msgstr "Wybierz kategorię"
 
+#: InvenTree/forms.py:226
+msgid "E-mail (again)"
+msgstr ""
+
+#: InvenTree/forms.py:230
+#, fuzzy
+#| msgid "Email Address"
+msgid "E-mail address confirmation"
+msgstr "Adres e-mail"
+
+#: InvenTree/forms.py:250
+msgid "You must type the same email each time."
+msgstr ""
+
 #: InvenTree/helpers.py:401
 #, python-brace-format
 msgid "Duplicate serial: {n}"
@@ -118,8 +133,8 @@ msgstr "Komentarz"
 msgid "File comment"
 msgstr "Komentarz pliku"
 
-#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1011
-#: common/models.py:1012 part/models.py:2055
+#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1055
+#: common/models.py:1056 part/models.py:2055
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/translated/stock.js:1669
 msgid "User"
@@ -205,75 +220,75 @@ msgstr "Numer musi być prawidłowy"
 msgid "Filename"
 msgstr ""
 
-#: InvenTree/settings.py:523
+#: InvenTree/settings.py:529
 msgid "German"
 msgstr "Niemiecki"
 
-#: InvenTree/settings.py:524
+#: InvenTree/settings.py:530
 msgid "Greek"
 msgstr "Grecki"
 
-#: InvenTree/settings.py:525
+#: InvenTree/settings.py:531
 msgid "English"
 msgstr "Angielski"
 
-#: InvenTree/settings.py:526
+#: InvenTree/settings.py:532
 msgid "Spanish"
 msgstr "Hiszpański"
 
-#: InvenTree/settings.py:527
+#: InvenTree/settings.py:533
 msgid "French"
 msgstr "Francuski"
 
-#: InvenTree/settings.py:528
+#: InvenTree/settings.py:534
 msgid "Hebrew"
 msgstr "Hebrajski"
 
-#: InvenTree/settings.py:529
+#: InvenTree/settings.py:535
 msgid "Italian"
 msgstr "Włoski"
 
-#: InvenTree/settings.py:530
+#: InvenTree/settings.py:536
 msgid "Japanese"
 msgstr "Japoński"
 
-#: InvenTree/settings.py:531
+#: InvenTree/settings.py:537
 msgid "Korean"
 msgstr "Koreański"
 
-#: InvenTree/settings.py:532
+#: InvenTree/settings.py:538
 msgid "Dutch"
 msgstr "Holenderski"
 
-#: InvenTree/settings.py:533
+#: InvenTree/settings.py:539
 msgid "Norwegian"
 msgstr "Norweski"
 
-#: InvenTree/settings.py:534
+#: InvenTree/settings.py:540
 msgid "Polish"
 msgstr "Polski"
 
-#: InvenTree/settings.py:535
+#: InvenTree/settings.py:541
 msgid "Russian"
 msgstr "Rosyjski"
 
-#: InvenTree/settings.py:536
+#: InvenTree/settings.py:542
 msgid "Swedish"
 msgstr "Szwedzki"
 
-#: InvenTree/settings.py:537
+#: InvenTree/settings.py:543
 msgid "Thai"
 msgstr "Tajski"
 
-#: InvenTree/settings.py:538
+#: InvenTree/settings.py:544
 msgid "Turkish"
 msgstr "Turecki"
 
-#: InvenTree/settings.py:539
+#: InvenTree/settings.py:545
 msgid "Vietnamese"
 msgstr "Wietnamski"
 
-#: InvenTree/settings.py:540
+#: InvenTree/settings.py:546
 msgid "Chinese"
 msgstr "Chiński"
 
@@ -458,27 +473,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:610
+#: InvenTree/views.py:616
 msgid "Delete Item"
 msgstr "Usuń element"
 
-#: InvenTree/views.py:659
+#: InvenTree/views.py:665
 msgid "Check box to confirm item deletion"
 msgstr "Zaznacz pole aby potwierdzić usunięcie elementu"
 
-#: InvenTree/views.py:674 templates/InvenTree/settings/user.html:14
+#: InvenTree/views.py:680 templates/InvenTree/settings/user.html:18
 msgid "Edit User Information"
 msgstr "Edytuj informacje użytkownika"
 
-#: InvenTree/views.py:685 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:691 templates/InvenTree/settings/user.html:22
 msgid "Set Password"
 msgstr "Ustaw hasło"
 
-#: InvenTree/views.py:704
+#: InvenTree/views.py:710
 msgid "Password fields must match"
 msgstr "Hasła muszą być zgodne"
 
-#: InvenTree/views.py:910 templates/navbar.html:97
+#: InvenTree/views.py:954 templates/navbar.html:97
 msgid "System Information"
 msgstr "Informacja systemowa"
 
@@ -551,7 +566,7 @@ msgstr ""
 #: build/forms.py:48 build/forms.py:90 build/models.py:1281
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:1043
+#: build/templates/build/detail.html:34 common/models.py:1087
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:101 order/forms.py:123 order/models.py:720
 #: order/models.py:982 order/templates/order/order_wizard/match_parts.html:30
@@ -681,8 +696,8 @@ msgstr "Zlecenie Budowy"
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:50
 #: part/templates/part/navbar.html:53 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:171
-#: templates/InvenTree/settings/navbar.html:107
-#: templates/InvenTree/settings/navbar.html:109 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 users/models.py:44
 msgid "Build Orders"
 msgstr "Zlecenia budowy"
 
@@ -1552,7 +1567,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:308 common/models.py:843 common/models.py:1004
+#: common/models.py:308 common/models.py:887 common/models.py:1048
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1966,196 +1981,262 @@ msgstr ""
 msgid "Enable PO functionality in InvenTree interface"
 msgstr ""
 
-#: common/models.py:854
-msgid "Show starred parts"
+#: common/models.py:836
+#, fuzzy
+#| msgid "Enter password"
+msgid "Enable password forgot"
+msgstr "Wprowadź hasło"
+
+#: common/models.py:837
+msgid "Enable password forgot function on the login-pages"
 msgstr ""
 
+#: common/models.py:842
+#, fuzzy
+#| msgid "Label description"
+msgid "Enable registration"
+msgstr "Opis etykiety"
+
+#: common/models.py:843
+msgid "Enable self-registration for users on the login-pages"
+msgstr ""
+
+#: common/models.py:848
+#, fuzzy
+#| msgid "Enabled"
+msgid "Enable SSO"
+msgstr "Aktywne"
+
+#: common/models.py:849
+msgid "Enable SSO on the login-pages"
+msgstr ""
+
+#: common/models.py:854
+#, fuzzy
+#| msgid "Required"
+msgid "E-Mail required"
+msgstr "Wymagane"
+
 #: common/models.py:855
-msgid "Show starred parts on the homepage"
+msgid "Require user to supply mail on signup"
 msgstr ""
 
 #: common/models.py:860
-msgid "Show latest parts"
+msgid "Auto-fill SSO users"
 msgstr ""
 
 #: common/models.py:861
-msgid "Show latest parts on the homepage"
+msgid "Automatically fill out user-details from SSO account-data"
 msgstr ""
 
 #: common/models.py:866
-msgid "Recent Part Count"
+msgid "Mail twice"
 msgstr ""
 
 #: common/models.py:867
-msgid "Number of recent parts to display on index page"
+msgid "On signup ask users twice for their mail"
 msgstr ""
 
+#: common/models.py:872
+#, fuzzy
+#| msgid "Set Password"
+msgid "Password twice"
+msgstr "Ustaw hasło"
+
 #: common/models.py:873
-msgid "Show unvalidated BOMs"
-msgstr ""
-
-#: common/models.py:874
-msgid "Show BOMs that await validation on the homepage"
-msgstr ""
-
-#: common/models.py:879
-msgid "Show recent stock changes"
-msgstr ""
-
-#: common/models.py:880
-msgid "Show recently changed stock items on the homepage"
-msgstr ""
-
-#: common/models.py:885
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:886
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:891
-msgid "Show low stock"
-msgstr ""
-
-#: common/models.py:892
-msgid "Show low stock items on the homepage"
-msgstr ""
-
-#: common/models.py:897
-msgid "Show depleted stock"
+msgid "On signup ask users twice for their password"
 msgstr ""
 
 #: common/models.py:898
-msgid "Show depleted stock items on the homepage"
+msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:903
-msgid "Show needed stock"
+#: common/models.py:899
+msgid "Show starred parts on the homepage"
 msgstr ""
 
 #: common/models.py:904
-msgid "Show stock items needed for builds on the homepage"
+msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:909
-msgid "Show expired stock"
+#: common/models.py:905
+msgid "Show latest parts on the homepage"
 msgstr ""
 
 #: common/models.py:910
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:911
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:917
+msgid "Show unvalidated BOMs"
+msgstr ""
+
+#: common/models.py:918
+msgid "Show BOMs that await validation on the homepage"
+msgstr ""
+
+#: common/models.py:923
+msgid "Show recent stock changes"
+msgstr ""
+
+#: common/models.py:924
+msgid "Show recently changed stock items on the homepage"
+msgstr ""
+
+#: common/models.py:929
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:930
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:935
+msgid "Show low stock"
+msgstr ""
+
+#: common/models.py:936
+msgid "Show low stock items on the homepage"
+msgstr ""
+
+#: common/models.py:941
+msgid "Show depleted stock"
+msgstr ""
+
+#: common/models.py:942
+msgid "Show depleted stock items on the homepage"
+msgstr ""
+
+#: common/models.py:947
+msgid "Show needed stock"
+msgstr ""
+
+#: common/models.py:948
+msgid "Show stock items needed for builds on the homepage"
+msgstr ""
+
+#: common/models.py:953
+msgid "Show expired stock"
+msgstr ""
+
+#: common/models.py:954
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:915
+#: common/models.py:959
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:916
+#: common/models.py:960
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:921
+#: common/models.py:965
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:922
+#: common/models.py:966
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:927
+#: common/models.py:971
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:928
+#: common/models.py:972
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:933
+#: common/models.py:977
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:934
+#: common/models.py:978
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:939
+#: common/models.py:983
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:940
+#: common/models.py:984
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:945
+#: common/models.py:989
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:946
+#: common/models.py:990
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:951
+#: common/models.py:995
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:952
+#: common/models.py:996
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:958
+#: common/models.py:1002
 msgid "Inline label display"
 msgstr ""
 
-#: common/models.py:959
+#: common/models.py:1003
 msgid "Display PDF labels in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:965
+#: common/models.py:1009
 msgid "Inline report display"
 msgstr ""
 
-#: common/models.py:966
+#: common/models.py:1010
 msgid "Display PDF reports in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:972
+#: common/models.py:1016
 msgid "Search Preview Results"
 msgstr ""
 
-#: common/models.py:973
+#: common/models.py:1017
 msgid "Number of results to show in search preview window"
 msgstr ""
 
-#: common/models.py:979
+#: common/models.py:1023
 msgid "Show Quantity in Forms"
 msgstr "Pokaż ilość w formularzach"
 
-#: common/models.py:980
+#: common/models.py:1024
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:986
+#: common/models.py:1030
 msgid "Escape Key Closes Forms"
 msgstr ""
 
-#: common/models.py:987
+#: common/models.py:1031
 msgid "Use the escape key to close modal forms"
 msgstr ""
 
-#: common/models.py:1044 company/forms.py:43
+#: common/models.py:1088 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:1051 company/templates/company/supplier_part.html:231
+#: common/models.py:1095 company/templates/company/supplier_part.html:231
 #: templates/js/translated/part.js:1369
 msgid "Price"
 msgstr "Cena"
 
-#: common/models.py:1052
+#: common/models.py:1096
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1145
+#: common/models.py:1189
 msgid "Default"
 msgstr "Domyślny"
 
@@ -2604,8 +2685,8 @@ msgstr "Zapasy dostawcy"
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:82
 #: part/templates/part/navbar.html:85 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:229
-#: templates/InvenTree/settings/navbar.html:113
-#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:119
+#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:44
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2628,8 +2709,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:91
 #: part/templates/part/navbar.html:94 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:249
-#: templates/InvenTree/settings/navbar.html:119
-#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:55
+#: templates/InvenTree/settings/navbar.html:125
+#: templates/InvenTree/settings/navbar.html:127 templates/navbar.html:55
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2715,7 +2796,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part.html:239
 #: part/templates/part/detail.html:214 part/templates/part/detail.html:294
 #: part/templates/part/detail.html:317 templates/js/translated/company.js:424
-#: templates/js/translated/helpers.js:31 users/models.py:194
+#: templates/js/translated/helpers.js:31 users/models.py:199
 msgid "Delete"
 msgstr "Usuń"
 
@@ -2764,8 +2845,8 @@ msgstr ""
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:182
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109
 #: templates/js/translated/part.js:540 templates/js/translated/part.js:769
 #: templates/js/translated/part.js:945 templates/js/translated/stock.js:182
 #: templates/js/translated/stock.js:829 templates/navbar.html:32
@@ -3727,8 +3808,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
 #: templates/js/translated/part.js:1165 templates/navbar.html:29
 #: templates/stats.html:80 templates/stats.html:89 users/models.py:41
 msgid "Parts"
@@ -3942,7 +4023,7 @@ msgstr ""
 
 #: part/models.py:696 part/models.py:2299
 #: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:168
+#: templates/InvenTree/settings/settings.html:169
 #: templates/js/translated/part.js:927
 msgid "Category"
 msgstr "Kategoria"
@@ -4132,7 +4213,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2256 part/models.py:2305 part/models.py:2306
-#: templates/InvenTree/settings/settings.html:163
+#: templates/InvenTree/settings/settings.html:164
 msgid "Parameter Template"
 msgstr ""
 
@@ -4144,7 +4225,7 @@ msgstr "Dane"
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2310 templates/InvenTree/settings/settings.html:172
+#: part/models.py:2310 templates/InvenTree/settings/settings.html:173
 msgid "Default Value"
 msgstr "Wartość domyślna"
 
@@ -6162,6 +6243,16 @@ msgstr ""
 msgid "Setting"
 msgstr ""
 
+#: templates/InvenTree/settings/login.html:9
+#, fuzzy
+#| msgid "Change Setting"
+msgid "Login Settings"
+msgstr "Zmień ustawienie"
+
+#: templates/InvenTree/settings/login.html:22 templates/account/signup.html:5
+msgid "Signup"
+msgstr ""
+
 #: templates/InvenTree/settings/navbar.html:12
 #: templates/InvenTree/settings/user_settings.html:9
 msgid "User Settings"
@@ -6215,22 +6306,27 @@ msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
-msgid "Barcodes"
+#: templates/InvenTree/settings/navbar.html:73 templates/navbar.html:87
+msgid "Login"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:77
 #: templates/InvenTree/settings/navbar.html:79
-msgid "Currencies"
+msgid "Barcodes"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:83
 #: templates/InvenTree/settings/navbar.html:85
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
 msgid "Reporting"
 msgstr ""
 
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103
 msgid "Categories"
 msgstr ""
 
@@ -6271,21 +6367,21 @@ msgstr ""
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:153
+#: templates/InvenTree/settings/settings.html:154
 msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:175
-#: templates/InvenTree/settings/settings.html:274
-msgid "Edit Template"
-msgstr ""
-
 #: templates/InvenTree/settings/settings.html:176
 #: templates/InvenTree/settings/settings.html:275
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/settings.html:177
+#: templates/InvenTree/settings/settings.html:276
 msgid "Delete Template"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:254
+#: templates/InvenTree/settings/settings.html:255
 msgid "No part parameter templates found"
 msgstr ""
 
@@ -6297,70 +6393,146 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:9
+#: templates/InvenTree/settings/user.html:11
 msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:15
+#: templates/InvenTree/settings/user.html:19
 #: templates/js/translated/helpers.js:26
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:17
+#: templates/InvenTree/settings/user.html:21
+#: templates/account/password_reset_from_key.html:4
+#: templates/account/password_reset_from_key.html:7
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:24
-#: templates/registration/login.html:58
+#: templates/InvenTree/settings/user.html:28
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:32
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:36
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
-msgid "Email Address"
-msgstr "Adres e-mail"
-
 #: templates/InvenTree/settings/user.html:42
-msgid "Theme Settings"
+msgid "E-Mail"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:47
+msgid "The following e-mail addresses are associated with your account:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:61
+msgid "Verified"
 msgstr ""
 
 #: templates/InvenTree/settings/user.html:63
+msgid "Unverified"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:65
+msgid "Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:71
+msgid "Make Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:72
+msgid "Re-send Verification"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:73
+#: templates/InvenTree/settings/user.html:130
+#, fuzzy
+#| msgid "Remove part"
+msgid "Remove"
+msgstr "Usuń część"
+
+#: templates/InvenTree/settings/user.html:80
+#, fuzzy
+#| msgid "Warning"
+msgid "Warning:"
+msgstr "Ostrzeżenie"
+
+#: templates/InvenTree/settings/user.html:81
+msgid "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."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:88
+#, fuzzy
+#| msgid "Email Address"
+msgid "Add E-mail Address"
+msgstr "Adres e-mail"
+
+#: templates/InvenTree/settings/user.html:93
+#, fuzzy
+#| msgid "Email"
+msgid "Add E-mail"
+msgstr "Adres E-Mail"
+
+#: templates/InvenTree/settings/user.html:100
+#, fuzzy
+#| msgid "Stock counted"
+msgid "Social Accounts"
+msgstr "Zapas policzony"
+
+#: templates/InvenTree/settings/user.html:105
+msgid "You can sign in to your account using any of the following third party accounts:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:138
+msgid "You currently have no social network accounts connected to this account."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:142
+msgid "Add a 3rd Party Account"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:153
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:174
 msgid "Set Theme"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:70
+#: templates/InvenTree/settings/user.html:181
 msgid "Language Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:89
+#: templates/InvenTree/settings/user.html:200
 #, python-format
 msgid "%(lang_translated)s%% translated"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:91
+#: templates/InvenTree/settings/user.html:202
 msgid "No translations available"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:98
+#: templates/InvenTree/settings/user.html:209
 msgid "Set Language"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:103
+#: templates/InvenTree/settings/user.html:214
 msgid "Help the translation efforts!"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:104
+#: templates/InvenTree/settings/user.html:215
 #, python-format
 msgid "Native language translation of the InvenTree web application is <a href=\"%(link)s\">community contributed via crowdin</a>. Contributions are welcomed and encouraged."
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:223
+msgid "Do you really want to remove the selected e-mail address?"
+msgstr ""
+
 #: templates/InvenTree/settings/user_forms.html:9
 msgid "Form Settings"
 msgstr ""
@@ -6452,6 +6624,117 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#: templates/account/email_confirm.html:6
+#: templates/account/email_confirm.html:10
+#, fuzzy
+#| msgid "Email Address"
+msgid "Confirm E-mail Address"
+msgstr "Adres e-mail"
+
+#: templates/account/email_confirm.html:16
+#, python-format
+msgid "Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail address for user %(user_display)s."
+msgstr ""
+
+#: templates/account/email_confirm.html:27
+#, python-format
+msgid "This e-mail confirmation link expired or is invalid. Please <a href=\"%(email_url)s\">issue a new e-mail confirmation request</a>."
+msgstr ""
+
+#: templates/account/login.html:5 templates/account/login.html:14
+#: templates/account/login.html:36
+msgid "Sign In"
+msgstr ""
+
+#: templates/account/login.html:19
+#, python-format
+msgid ""
+"Please sign in with one\n"
+"of your existing third party accounts or  <a class=\"btn btn-primary btn-small\" href=\"%(signup_url)s\">sign up</a>\n"
+"for a account and sign in below:"
+msgstr ""
+
+#: templates/account/login.html:23
+#, python-format
+msgid ""
+"If you have not created an account yet, then please\n"
+"<a href=\"%(signup_url)s\">sign up</a> first."
+msgstr ""
+
+#: templates/account/login.html:38
+#, fuzzy
+#| msgid "Set Password"
+msgid "Forgot Password?"
+msgstr "Ustaw hasło"
+
+#: templates/account/login.html:45
+msgid "or use SSO"
+msgstr ""
+
+#: templates/account/logout.html:5 templates/account/logout.html:8
+#: templates/account/logout.html:17
+msgid "Sign Out"
+msgstr ""
+
+#: templates/account/logout.html:10
+#, fuzzy
+#| msgid "Are you sure you want to delete this stock item?"
+msgid "Are you sure you want to sign out?"
+msgstr "Czy na pewno chcesz usunąć tą część?"
+
+#: templates/account/password_reset.html:5
+#: templates/account/password_reset.html:12
+#, fuzzy
+#| msgid "Set Password"
+msgid "Password Reset"
+msgstr "Ustaw hasło"
+
+#: templates/account/password_reset.html:18
+msgid "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it."
+msgstr ""
+
+#: templates/account/password_reset.html:23
+#, fuzzy
+#| msgid "Set Password"
+msgid "Reset My Password"
+msgstr "Ustaw hasło"
+
+#: templates/account/password_reset.html:27 templates/account/signup.html:36
+msgid "This function is currently disabled. Please contact an administrator."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:7
+msgid "Bad Token"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:11
+#, python-format
+msgid "The password reset link was invalid, possibly because it has already been used.  Please request a <a href=\"%(passwd_reset_url)s\">new password reset</a>."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:17
+#, fuzzy
+#| msgid "Enter password"
+msgid "change password"
+msgstr "Wprowadź hasło"
+
+#: templates/account/password_reset_from_key.html:20
+msgid "Your password is now changed."
+msgstr ""
+
+#: templates/account/signup.html:11 templates/account/signup.html:22
+msgid "Sign Up"
+msgstr ""
+
+#: templates/account/signup.html:13
+#, python-format
+msgid "Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>."
+msgstr ""
+
+#: templates/account/signup.html:27
+msgid "Or use a SSO-provider for signup"
+msgstr ""
+
 #: templates/image_download.html:8
 msgid "Specify URL for downloading image"
 msgstr ""
@@ -7631,7 +7914,7 @@ msgstr ""
 msgid "Add Stock"
 msgstr "Dodaj stan"
 
-#: templates/js/translated/stock.js:165 users/models.py:190
+#: templates/js/translated/stock.js:165 users/models.py:195
 msgid "Add"
 msgstr "Dodaj"
 
@@ -8088,10 +8371,6 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: templates/navbar.html:87 templates/registration/login.html:89
-msgid "Login"
-msgstr ""
-
 #: templates/navbar.html:106
 msgid "About InvenTree"
 msgstr ""
@@ -8100,68 +8379,12 @@ msgstr ""
 msgid "QR data not provided"
 msgstr ""
 
-#: templates/registration/logged_out.html:50
-msgid "You have been logged out"
+#: templates/registration/logged_out.html:6
+msgid "You were logged out successfully."
 msgstr ""
 
-#: templates/registration/logged_out.html:51
-#: templates/registration/password_reset_complete.html:51
-#: templates/registration/password_reset_done.html:58
-msgid "Return to login screen"
-msgstr ""
-
-#: templates/registration/login.html:64
-msgid "Enter username"
-msgstr ""
-
-#: templates/registration/login.html:70
-msgid "Password"
-msgstr ""
-
-#: templates/registration/login.html:83
-msgid "Username / password combination is incorrect"
-msgstr ""
-
-#: templates/registration/login.html:95
-#: templates/registration/password_reset_form.html:51
-msgid "Forgotten your password?"
-msgstr ""
-
-#: templates/registration/login.html:95
-msgid "Click here to reset"
-msgstr ""
-
-#: templates/registration/password_reset_complete.html:50
-msgid "Password reset complete"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:52
-#: templates/registration/password_reset_confirm.html:56
-msgid "Change password"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:60
-msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:51
-msgid "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:54
-msgid "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:52
-msgid "Enter your email address below."
-msgstr "Wprowadź swój adres e-mail poniżej."
-
-#: templates/registration/password_reset_form.html:53
-msgid "An email will be sent with password reset instructions."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:58
-msgid "Send email"
+#: templates/registration/logged_out.html:8
+msgid "Log in again"
 msgstr ""
 
 #: templates/stats.html:13
@@ -8300,38 +8523,41 @@ msgstr "Uprawnienia"
 msgid "Important dates"
 msgstr ""
 
-#: users/models.py:177
+#: users/models.py:182
 msgid "Permission set"
 msgstr "Uprawnienia nadane"
 
-#: users/models.py:185
+#: users/models.py:190
 msgid "Group"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "View"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "Permission to view items"
 msgstr "Uprawnienie do wyświetlania przedmiotów"
 
-#: users/models.py:190
+#: users/models.py:195
 msgid "Permission to add items"
 msgstr "Uprawnienie do dodawania przedmiotów"
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Change"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Permissions to edit items"
 msgstr "Uprawnienie do edycji przedmiotów"
 
-#: users/models.py:194
+#: users/models.py:199
 msgid "Permission to delete items"
 msgstr "Uprawnienie do usuwania przedmiotów"
 
+#~ msgid "Enter your email address below."
+#~ msgstr "Wprowadź swój adres e-mail poniżej."
+
 #~ msgid "Edit Allocation Quantity"
 #~ msgstr "Edytuj zarezerwowaną ilość"
 
diff --git a/InvenTree/locale/ru/LC_MESSAGES/django.po b/InvenTree/locale/ru/LC_MESSAGES/django.po
index e9c5faf21b..9d49edab52 100644
--- a/InvenTree/locale/ru/LC_MESSAGES/django.po
+++ b/InvenTree/locale/ru/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-11 01:01+0000\n"
+"POT-Creation-Date: 2021-10-11 06:21+0000\n"
 "PO-Revision-Date: 2021-09-12 13:44\n"
 "Last-Translator: \n"
 "Language-Team: Russian\n"
@@ -33,41 +33,54 @@ msgstr "Соответствующее действие не найдено"
 msgid "Enter date"
 msgstr "Введите дату"
 
-#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:116 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:173 build/forms.py:215 order/forms.py:27
 #: order/forms.py:38 order/forms.py:49 order/forms.py:60 order/forms.py:71
-#: part/forms.py:108 templates/js/translated/forms.js:564
+#: part/forms.py:108 templates/account/email_confirm.html:20
+#: templates/js/translated/forms.js:564
 msgid "Confirm"
 msgstr "Подтвердить"
 
-#: InvenTree/forms.py:127
+#: InvenTree/forms.py:132
 msgid "Confirm delete"
 msgstr "Подтвердите удаление"
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:133
 msgid "Confirm item deletion"
 msgstr "Подтвердите удаление элемента"
 
-#: InvenTree/forms.py:160 templates/registration/login.html:76
+#: InvenTree/forms.py:164
 msgid "Enter password"
 msgstr "Введите пароль"
 
-#: InvenTree/forms.py:161
+#: InvenTree/forms.py:165
 msgid "Enter new password"
 msgstr "Введите новый пароль"
 
-#: InvenTree/forms.py:168
+#: InvenTree/forms.py:172
 msgid "Confirm password"
 msgstr "Подтвердить пароль"
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:173
 msgid "Confirm new password"
 msgstr "Подтвердите новый пароль"
 
-#: InvenTree/forms.py:201
+#: InvenTree/forms.py:205
 msgid "Select Category"
 msgstr "Выбрать категорию"
 
+#: InvenTree/forms.py:226
+msgid "E-mail (again)"
+msgstr ""
+
+#: InvenTree/forms.py:230
+msgid "E-mail address confirmation"
+msgstr ""
+
+#: InvenTree/forms.py:250
+msgid "You must type the same email each time."
+msgstr ""
+
 #: InvenTree/helpers.py:401
 #, python-brace-format
 msgid "Duplicate serial: {n}"
@@ -118,8 +131,8 @@ msgstr "Комментарий"
 msgid "File comment"
 msgstr "Комментарий к файлу"
 
-#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1011
-#: common/models.py:1012 part/models.py:2055
+#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1055
+#: common/models.py:1056 part/models.py:2055
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/translated/stock.js:1669
 msgid "User"
@@ -205,75 +218,75 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: InvenTree/settings.py:523
+#: InvenTree/settings.py:529
 msgid "German"
 msgstr "Немецкий"
 
-#: InvenTree/settings.py:524
+#: InvenTree/settings.py:530
 msgid "Greek"
 msgstr "Греческий"
 
-#: InvenTree/settings.py:525
+#: InvenTree/settings.py:531
 msgid "English"
 msgstr "Английский"
 
-#: InvenTree/settings.py:526
+#: InvenTree/settings.py:532
 msgid "Spanish"
 msgstr "Испанский"
 
-#: InvenTree/settings.py:527
+#: InvenTree/settings.py:533
 msgid "French"
 msgstr "Французский"
 
-#: InvenTree/settings.py:528
+#: InvenTree/settings.py:534
 msgid "Hebrew"
 msgstr "Иврит"
 
-#: InvenTree/settings.py:529
+#: InvenTree/settings.py:535
 msgid "Italian"
 msgstr "Итальянский"
 
-#: InvenTree/settings.py:530
+#: InvenTree/settings.py:536
 msgid "Japanese"
 msgstr "Японский"
 
-#: InvenTree/settings.py:531
+#: InvenTree/settings.py:537
 msgid "Korean"
 msgstr "Корейский"
 
-#: InvenTree/settings.py:532
+#: InvenTree/settings.py:538
 msgid "Dutch"
 msgstr "Голландский"
 
-#: InvenTree/settings.py:533
+#: InvenTree/settings.py:539
 msgid "Norwegian"
 msgstr "Норвежский"
 
-#: InvenTree/settings.py:534
+#: InvenTree/settings.py:540
 msgid "Polish"
 msgstr "Польский"
 
-#: InvenTree/settings.py:535
+#: InvenTree/settings.py:541
 msgid "Russian"
 msgstr "Русский"
 
-#: InvenTree/settings.py:536
+#: InvenTree/settings.py:542
 msgid "Swedish"
 msgstr "Шведский"
 
-#: InvenTree/settings.py:537
+#: InvenTree/settings.py:543
 msgid "Thai"
 msgstr "Тайский"
 
-#: InvenTree/settings.py:538
+#: InvenTree/settings.py:544
 msgid "Turkish"
 msgstr "Турецкий"
 
-#: InvenTree/settings.py:539
+#: InvenTree/settings.py:545
 msgid "Vietnamese"
 msgstr "Вьетнамский"
 
-#: InvenTree/settings.py:540
+#: InvenTree/settings.py:546
 msgid "Chinese"
 msgstr "Китайский"
 
@@ -458,27 +471,27 @@ msgstr "Перегрузка не может превысить 100%"
 msgid "Overage must be an integer value or a percentage"
 msgstr "Превышение должно быть целым числом или процентом"
 
-#: InvenTree/views.py:610
+#: InvenTree/views.py:616
 msgid "Delete Item"
 msgstr "Удалить элемент"
 
-#: InvenTree/views.py:659
+#: InvenTree/views.py:665
 msgid "Check box to confirm item deletion"
 msgstr "Установите флажок для подтверждения удаления элемента"
 
-#: InvenTree/views.py:674 templates/InvenTree/settings/user.html:14
+#: InvenTree/views.py:680 templates/InvenTree/settings/user.html:18
 msgid "Edit User Information"
 msgstr "Редактировать информацию о пользователе"
 
-#: InvenTree/views.py:685 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:691 templates/InvenTree/settings/user.html:22
 msgid "Set Password"
 msgstr "Установить пароль"
 
-#: InvenTree/views.py:704
+#: InvenTree/views.py:710
 msgid "Password fields must match"
 msgstr "Пароли должны совпадать"
 
-#: InvenTree/views.py:910 templates/navbar.html:97
+#: InvenTree/views.py:954 templates/navbar.html:97
 msgid "System Information"
 msgstr "Информация о системе"
 
@@ -551,7 +564,7 @@ msgstr "Целевая дата для сборки. Сборка будет п
 #: build/forms.py:48 build/forms.py:90 build/models.py:1281
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:1043
+#: build/templates/build/detail.html:34 common/models.py:1087
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:101 order/forms.py:123 order/models.py:720
 #: order/models.py:982 order/templates/order/order_wizard/match_parts.html:30
@@ -681,8 +694,8 @@ msgstr "Порядок сборки"
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:50
 #: part/templates/part/navbar.html:53 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:171
-#: templates/InvenTree/settings/navbar.html:107
-#: templates/InvenTree/settings/navbar.html:109 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 users/models.py:44
 msgid "Build Orders"
 msgstr "Порядок сборки"
 
@@ -1545,7 +1558,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:308 common/models.py:843 common/models.py:1004
+#: common/models.py:308 common/models.py:887 common/models.py:1048
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1959,196 +1972,256 @@ msgstr ""
 msgid "Enable PO functionality in InvenTree interface"
 msgstr ""
 
+#: common/models.py:836
+#, fuzzy
+#| msgid "Enter password"
+msgid "Enable password forgot"
+msgstr "Введите пароль"
+
+#: common/models.py:837
+msgid "Enable password forgot function on the login-pages"
+msgstr ""
+
+#: common/models.py:842
+msgid "Enable registration"
+msgstr ""
+
+#: common/models.py:843
+msgid "Enable self-registration for users on the login-pages"
+msgstr ""
+
+#: common/models.py:848
+msgid "Enable SSO"
+msgstr ""
+
+#: common/models.py:849
+msgid "Enable SSO on the login-pages"
+msgstr ""
+
 #: common/models.py:854
-msgid "Show starred parts"
+msgid "E-Mail required"
 msgstr ""
 
 #: common/models.py:855
-msgid "Show starred parts on the homepage"
+msgid "Require user to supply mail on signup"
 msgstr ""
 
 #: common/models.py:860
-msgid "Show latest parts"
+msgid "Auto-fill SSO users"
 msgstr ""
 
 #: common/models.py:861
-msgid "Show latest parts on the homepage"
+msgid "Automatically fill out user-details from SSO account-data"
 msgstr ""
 
 #: common/models.py:866
-msgid "Recent Part Count"
+msgid "Mail twice"
 msgstr ""
 
 #: common/models.py:867
-msgid "Number of recent parts to display on index page"
+msgid "On signup ask users twice for their mail"
 msgstr ""
 
+#: common/models.py:872
+#, fuzzy
+#| msgid "Set Password"
+msgid "Password twice"
+msgstr "Установить пароль"
+
 #: common/models.py:873
-msgid "Show unvalidated BOMs"
-msgstr ""
-
-#: common/models.py:874
-msgid "Show BOMs that await validation on the homepage"
-msgstr ""
-
-#: common/models.py:879
-msgid "Show recent stock changes"
-msgstr ""
-
-#: common/models.py:880
-msgid "Show recently changed stock items on the homepage"
-msgstr ""
-
-#: common/models.py:885
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:886
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:891
-msgid "Show low stock"
-msgstr ""
-
-#: common/models.py:892
-msgid "Show low stock items on the homepage"
-msgstr ""
-
-#: common/models.py:897
-msgid "Show depleted stock"
+msgid "On signup ask users twice for their password"
 msgstr ""
 
 #: common/models.py:898
-msgid "Show depleted stock items on the homepage"
+msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:903
-msgid "Show needed stock"
+#: common/models.py:899
+msgid "Show starred parts on the homepage"
 msgstr ""
 
 #: common/models.py:904
-msgid "Show stock items needed for builds on the homepage"
+msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:909
-msgid "Show expired stock"
+#: common/models.py:905
+msgid "Show latest parts on the homepage"
 msgstr ""
 
 #: common/models.py:910
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:911
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:917
+msgid "Show unvalidated BOMs"
+msgstr ""
+
+#: common/models.py:918
+msgid "Show BOMs that await validation on the homepage"
+msgstr ""
+
+#: common/models.py:923
+msgid "Show recent stock changes"
+msgstr ""
+
+#: common/models.py:924
+msgid "Show recently changed stock items on the homepage"
+msgstr ""
+
+#: common/models.py:929
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:930
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:935
+msgid "Show low stock"
+msgstr ""
+
+#: common/models.py:936
+msgid "Show low stock items on the homepage"
+msgstr ""
+
+#: common/models.py:941
+msgid "Show depleted stock"
+msgstr ""
+
+#: common/models.py:942
+msgid "Show depleted stock items on the homepage"
+msgstr ""
+
+#: common/models.py:947
+msgid "Show needed stock"
+msgstr ""
+
+#: common/models.py:948
+msgid "Show stock items needed for builds on the homepage"
+msgstr ""
+
+#: common/models.py:953
+msgid "Show expired stock"
+msgstr ""
+
+#: common/models.py:954
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:915
+#: common/models.py:959
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:916
+#: common/models.py:960
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:921
+#: common/models.py:965
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:922
+#: common/models.py:966
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:927
+#: common/models.py:971
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:928
+#: common/models.py:972
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:933
+#: common/models.py:977
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:934
+#: common/models.py:978
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:939
+#: common/models.py:983
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:940
+#: common/models.py:984
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:945
+#: common/models.py:989
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:946
+#: common/models.py:990
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:951
+#: common/models.py:995
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:952
+#: common/models.py:996
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:958
+#: common/models.py:1002
 msgid "Inline label display"
 msgstr ""
 
-#: common/models.py:959
+#: common/models.py:1003
 msgid "Display PDF labels in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:965
+#: common/models.py:1009
 msgid "Inline report display"
 msgstr ""
 
-#: common/models.py:966
+#: common/models.py:1010
 msgid "Display PDF reports in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:972
+#: common/models.py:1016
 msgid "Search Preview Results"
 msgstr ""
 
-#: common/models.py:973
+#: common/models.py:1017
 msgid "Number of results to show in search preview window"
 msgstr ""
 
-#: common/models.py:979
+#: common/models.py:1023
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:980
+#: common/models.py:1024
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:986
+#: common/models.py:1030
 msgid "Escape Key Closes Forms"
 msgstr ""
 
-#: common/models.py:987
+#: common/models.py:1031
 msgid "Use the escape key to close modal forms"
 msgstr ""
 
-#: common/models.py:1044 company/forms.py:43
+#: common/models.py:1088 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:1051 company/templates/company/supplier_part.html:231
+#: common/models.py:1095 company/templates/company/supplier_part.html:231
 #: templates/js/translated/part.js:1369
 msgid "Price"
 msgstr ""
 
-#: common/models.py:1052
+#: common/models.py:1096
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1145
+#: common/models.py:1189
 msgid "Default"
 msgstr ""
 
@@ -2597,8 +2670,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:82
 #: part/templates/part/navbar.html:85 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:229
-#: templates/InvenTree/settings/navbar.html:113
-#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:119
+#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:44
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2621,8 +2694,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:91
 #: part/templates/part/navbar.html:94 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:249
-#: templates/InvenTree/settings/navbar.html:119
-#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:55
+#: templates/InvenTree/settings/navbar.html:125
+#: templates/InvenTree/settings/navbar.html:127 templates/navbar.html:55
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2708,7 +2781,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part.html:239
 #: part/templates/part/detail.html:214 part/templates/part/detail.html:294
 #: part/templates/part/detail.html:317 templates/js/translated/company.js:424
-#: templates/js/translated/helpers.js:31 users/models.py:194
+#: templates/js/translated/helpers.js:31 users/models.py:199
 msgid "Delete"
 msgstr ""
 
@@ -2757,8 +2830,8 @@ msgstr ""
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:182
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109
 #: templates/js/translated/part.js:540 templates/js/translated/part.js:769
 #: templates/js/translated/part.js:945 templates/js/translated/stock.js:182
 #: templates/js/translated/stock.js:829 templates/navbar.html:32
@@ -3718,8 +3791,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
 #: templates/js/translated/part.js:1165 templates/navbar.html:29
 #: templates/stats.html:80 templates/stats.html:89 users/models.py:41
 msgid "Parts"
@@ -3933,7 +4006,7 @@ msgstr ""
 
 #: part/models.py:696 part/models.py:2299
 #: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:168
+#: templates/InvenTree/settings/settings.html:169
 #: templates/js/translated/part.js:927
 msgid "Category"
 msgstr ""
@@ -4123,7 +4196,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2256 part/models.py:2305 part/models.py:2306
-#: templates/InvenTree/settings/settings.html:163
+#: templates/InvenTree/settings/settings.html:164
 msgid "Parameter Template"
 msgstr ""
 
@@ -4135,7 +4208,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2310 templates/InvenTree/settings/settings.html:172
+#: part/models.py:2310 templates/InvenTree/settings/settings.html:173
 msgid "Default Value"
 msgstr ""
 
@@ -6151,6 +6224,14 @@ msgstr ""
 msgid "Setting"
 msgstr ""
 
+#: templates/InvenTree/settings/login.html:9
+msgid "Login Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/login.html:22 templates/account/signup.html:5
+msgid "Signup"
+msgstr ""
+
 #: templates/InvenTree/settings/navbar.html:12
 #: templates/InvenTree/settings/user_settings.html:9
 msgid "User Settings"
@@ -6204,22 +6285,27 @@ msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
-msgid "Barcodes"
+#: templates/InvenTree/settings/navbar.html:73 templates/navbar.html:87
+msgid "Login"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:77
 #: templates/InvenTree/settings/navbar.html:79
-msgid "Currencies"
+msgid "Barcodes"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:83
 #: templates/InvenTree/settings/navbar.html:85
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
 msgid "Reporting"
 msgstr ""
 
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103
 msgid "Categories"
 msgstr ""
 
@@ -6260,21 +6346,21 @@ msgstr ""
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:153
+#: templates/InvenTree/settings/settings.html:154
 msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:175
-#: templates/InvenTree/settings/settings.html:274
-msgid "Edit Template"
-msgstr ""
-
 #: templates/InvenTree/settings/settings.html:176
 #: templates/InvenTree/settings/settings.html:275
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/settings.html:177
+#: templates/InvenTree/settings/settings.html:276
 msgid "Delete Template"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:254
+#: templates/InvenTree/settings/settings.html:255
 msgid "No part parameter templates found"
 msgstr ""
 
@@ -6286,70 +6372,138 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:9
+#: templates/InvenTree/settings/user.html:11
 msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:15
+#: templates/InvenTree/settings/user.html:19
 #: templates/js/translated/helpers.js:26
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:17
+#: templates/InvenTree/settings/user.html:21
+#: templates/account/password_reset_from_key.html:4
+#: templates/account/password_reset_from_key.html:7
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:24
-#: templates/registration/login.html:58
+#: templates/InvenTree/settings/user.html:28
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:32
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:36
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
-msgid "Email Address"
+#: templates/InvenTree/settings/user.html:42
+msgid "E-Mail"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:42
-msgid "Theme Settings"
+#: templates/InvenTree/settings/user.html:47
+msgid "The following e-mail addresses are associated with your account:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:61
+msgid "Verified"
 msgstr ""
 
 #: templates/InvenTree/settings/user.html:63
+msgid "Unverified"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:65
+msgid "Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:71
+msgid "Make Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:72
+msgid "Re-send Verification"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:73
+#: templates/InvenTree/settings/user.html:130
+msgid "Remove"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:80
+msgid "Warning:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:81
+msgid "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."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:88
+msgid "Add E-mail Address"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:93
+msgid "Add E-mail"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:100
+#, fuzzy
+#| msgid "Stock counted"
+msgid "Social Accounts"
+msgstr "Склад подсчитан"
+
+#: templates/InvenTree/settings/user.html:105
+msgid "You can sign in to your account using any of the following third party accounts:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:138
+msgid "You currently have no social network accounts connected to this account."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:142
+msgid "Add a 3rd Party Account"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:153
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:174
 msgid "Set Theme"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:70
+#: templates/InvenTree/settings/user.html:181
 msgid "Language Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:89
+#: templates/InvenTree/settings/user.html:200
 #, python-format
 msgid "%(lang_translated)s%% translated"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:91
+#: templates/InvenTree/settings/user.html:202
 msgid "No translations available"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:98
+#: templates/InvenTree/settings/user.html:209
 msgid "Set Language"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:103
+#: templates/InvenTree/settings/user.html:214
 msgid "Help the translation efforts!"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:104
+#: templates/InvenTree/settings/user.html:215
 #, python-format
 msgid "Native language translation of the InvenTree web application is <a href=\"%(link)s\">community contributed via crowdin</a>. Contributions are welcomed and encouraged."
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:223
+msgid "Do you really want to remove the selected e-mail address?"
+msgstr ""
+
 #: templates/InvenTree/settings/user_forms.html:9
 msgid "Form Settings"
 msgstr ""
@@ -6441,6 +6595,113 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#: templates/account/email_confirm.html:6
+#: templates/account/email_confirm.html:10
+msgid "Confirm E-mail Address"
+msgstr ""
+
+#: templates/account/email_confirm.html:16
+#, python-format
+msgid "Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail address for user %(user_display)s."
+msgstr ""
+
+#: templates/account/email_confirm.html:27
+#, python-format
+msgid "This e-mail confirmation link expired or is invalid. Please <a href=\"%(email_url)s\">issue a new e-mail confirmation request</a>."
+msgstr ""
+
+#: templates/account/login.html:5 templates/account/login.html:14
+#: templates/account/login.html:36
+msgid "Sign In"
+msgstr ""
+
+#: templates/account/login.html:19
+#, python-format
+msgid ""
+"Please sign in with one\n"
+"of your existing third party accounts or  <a class=\"btn btn-primary btn-small\" href=\"%(signup_url)s\">sign up</a>\n"
+"for a account and sign in below:"
+msgstr ""
+
+#: templates/account/login.html:23
+#, python-format
+msgid ""
+"If you have not created an account yet, then please\n"
+"<a href=\"%(signup_url)s\">sign up</a> first."
+msgstr ""
+
+#: templates/account/login.html:38
+#, fuzzy
+#| msgid "Set Password"
+msgid "Forgot Password?"
+msgstr "Установить пароль"
+
+#: templates/account/login.html:45
+msgid "or use SSO"
+msgstr ""
+
+#: templates/account/logout.html:5 templates/account/logout.html:8
+#: templates/account/logout.html:17
+msgid "Sign Out"
+msgstr ""
+
+#: templates/account/logout.html:10
+msgid "Are you sure you want to sign out?"
+msgstr ""
+
+#: templates/account/password_reset.html:5
+#: templates/account/password_reset.html:12
+#, fuzzy
+#| msgid "Set Password"
+msgid "Password Reset"
+msgstr "Установить пароль"
+
+#: templates/account/password_reset.html:18
+msgid "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it."
+msgstr ""
+
+#: templates/account/password_reset.html:23
+#, fuzzy
+#| msgid "Set Password"
+msgid "Reset My Password"
+msgstr "Установить пароль"
+
+#: templates/account/password_reset.html:27 templates/account/signup.html:36
+msgid "This function is currently disabled. Please contact an administrator."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:7
+msgid "Bad Token"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:11
+#, python-format
+msgid "The password reset link was invalid, possibly because it has already been used.  Please request a <a href=\"%(passwd_reset_url)s\">new password reset</a>."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:17
+#, fuzzy
+#| msgid "Enter password"
+msgid "change password"
+msgstr "Введите пароль"
+
+#: templates/account/password_reset_from_key.html:20
+msgid "Your password is now changed."
+msgstr ""
+
+#: templates/account/signup.html:11 templates/account/signup.html:22
+msgid "Sign Up"
+msgstr ""
+
+#: templates/account/signup.html:13
+#, python-format
+msgid "Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>."
+msgstr ""
+
+#: templates/account/signup.html:27
+msgid "Or use a SSO-provider for signup"
+msgstr ""
+
 #: templates/image_download.html:8
 msgid "Specify URL for downloading image"
 msgstr ""
@@ -7602,7 +7863,7 @@ msgstr ""
 msgid "Add Stock"
 msgstr ""
 
-#: templates/js/translated/stock.js:165 users/models.py:190
+#: templates/js/translated/stock.js:165 users/models.py:195
 msgid "Add"
 msgstr ""
 
@@ -8059,10 +8320,6 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: templates/navbar.html:87 templates/registration/login.html:89
-msgid "Login"
-msgstr ""
-
 #: templates/navbar.html:106
 msgid "About InvenTree"
 msgstr ""
@@ -8071,68 +8328,12 @@ msgstr ""
 msgid "QR data not provided"
 msgstr ""
 
-#: templates/registration/logged_out.html:50
-msgid "You have been logged out"
+#: templates/registration/logged_out.html:6
+msgid "You were logged out successfully."
 msgstr ""
 
-#: templates/registration/logged_out.html:51
-#: templates/registration/password_reset_complete.html:51
-#: templates/registration/password_reset_done.html:58
-msgid "Return to login screen"
-msgstr ""
-
-#: templates/registration/login.html:64
-msgid "Enter username"
-msgstr ""
-
-#: templates/registration/login.html:70
-msgid "Password"
-msgstr ""
-
-#: templates/registration/login.html:83
-msgid "Username / password combination is incorrect"
-msgstr ""
-
-#: templates/registration/login.html:95
-#: templates/registration/password_reset_form.html:51
-msgid "Forgotten your password?"
-msgstr ""
-
-#: templates/registration/login.html:95
-msgid "Click here to reset"
-msgstr ""
-
-#: templates/registration/password_reset_complete.html:50
-msgid "Password reset complete"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:52
-#: templates/registration/password_reset_confirm.html:56
-msgid "Change password"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:60
-msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:51
-msgid "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:54
-msgid "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:52
-msgid "Enter your email address below."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:53
-msgid "An email will be sent with password reset instructions."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:58
-msgid "Send email"
+#: templates/registration/logged_out.html:8
+msgid "Log in again"
 msgstr ""
 
 #: templates/stats.html:13
@@ -8271,34 +8472,34 @@ msgstr ""
 msgid "Important dates"
 msgstr ""
 
-#: users/models.py:177
+#: users/models.py:182
 msgid "Permission set"
 msgstr ""
 
-#: users/models.py:185
+#: users/models.py:190
 msgid "Group"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "View"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "Permission to view items"
 msgstr ""
 
-#: users/models.py:190
+#: users/models.py:195
 msgid "Permission to add items"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Change"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Permissions to edit items"
 msgstr ""
 
-#: users/models.py:194
+#: users/models.py:199
 msgid "Permission to delete items"
 msgstr ""
diff --git a/InvenTree/locale/sv/LC_MESSAGES/django.po b/InvenTree/locale/sv/LC_MESSAGES/django.po
index 19449d4e38..51fc5133d7 100644
--- a/InvenTree/locale/sv/LC_MESSAGES/django.po
+++ b/InvenTree/locale/sv/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-11 01:01+0000\n"
+"POT-Creation-Date: 2021-10-11 06:21+0000\n"
 "PO-Revision-Date: 2021-09-12 13:44\n"
 "Last-Translator: \n"
 "Language-Team: Swedish\n"
@@ -33,41 +33,54 @@ msgstr ""
 msgid "Enter date"
 msgstr ""
 
-#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:116 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:173 build/forms.py:215 order/forms.py:27
 #: order/forms.py:38 order/forms.py:49 order/forms.py:60 order/forms.py:71
-#: part/forms.py:108 templates/js/translated/forms.js:564
+#: part/forms.py:108 templates/account/email_confirm.html:20
+#: templates/js/translated/forms.js:564
 msgid "Confirm"
 msgstr ""
 
-#: InvenTree/forms.py:127
+#: InvenTree/forms.py:132
 msgid "Confirm delete"
 msgstr ""
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:133
 msgid "Confirm item deletion"
 msgstr ""
 
-#: InvenTree/forms.py:160 templates/registration/login.html:76
+#: InvenTree/forms.py:164
 msgid "Enter password"
 msgstr ""
 
-#: InvenTree/forms.py:161
+#: InvenTree/forms.py:165
 msgid "Enter new password"
 msgstr ""
 
-#: InvenTree/forms.py:168
+#: InvenTree/forms.py:172
 msgid "Confirm password"
 msgstr ""
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:173
 msgid "Confirm new password"
 msgstr ""
 
-#: InvenTree/forms.py:201
+#: InvenTree/forms.py:205
 msgid "Select Category"
 msgstr ""
 
+#: InvenTree/forms.py:226
+msgid "E-mail (again)"
+msgstr ""
+
+#: InvenTree/forms.py:230
+msgid "E-mail address confirmation"
+msgstr ""
+
+#: InvenTree/forms.py:250
+msgid "You must type the same email each time."
+msgstr ""
+
 #: InvenTree/helpers.py:401
 #, python-brace-format
 msgid "Duplicate serial: {n}"
@@ -118,8 +131,8 @@ msgstr ""
 msgid "File comment"
 msgstr ""
 
-#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1011
-#: common/models.py:1012 part/models.py:2055
+#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1055
+#: common/models.py:1056 part/models.py:2055
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/translated/stock.js:1669
 msgid "User"
@@ -205,75 +218,75 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: InvenTree/settings.py:523
+#: InvenTree/settings.py:529
 msgid "German"
 msgstr ""
 
-#: InvenTree/settings.py:524
+#: InvenTree/settings.py:530
 msgid "Greek"
 msgstr ""
 
-#: InvenTree/settings.py:525
+#: InvenTree/settings.py:531
 msgid "English"
 msgstr ""
 
-#: InvenTree/settings.py:526
+#: InvenTree/settings.py:532
 msgid "Spanish"
 msgstr ""
 
-#: InvenTree/settings.py:527
+#: InvenTree/settings.py:533
 msgid "French"
 msgstr ""
 
-#: InvenTree/settings.py:528
+#: InvenTree/settings.py:534
 msgid "Hebrew"
 msgstr ""
 
-#: InvenTree/settings.py:529
+#: InvenTree/settings.py:535
 msgid "Italian"
 msgstr ""
 
-#: InvenTree/settings.py:530
+#: InvenTree/settings.py:536
 msgid "Japanese"
 msgstr ""
 
-#: InvenTree/settings.py:531
+#: InvenTree/settings.py:537
 msgid "Korean"
 msgstr ""
 
-#: InvenTree/settings.py:532
+#: InvenTree/settings.py:538
 msgid "Dutch"
 msgstr ""
 
-#: InvenTree/settings.py:533
+#: InvenTree/settings.py:539
 msgid "Norwegian"
 msgstr ""
 
-#: InvenTree/settings.py:534
+#: InvenTree/settings.py:540
 msgid "Polish"
 msgstr ""
 
-#: InvenTree/settings.py:535
+#: InvenTree/settings.py:541
 msgid "Russian"
 msgstr ""
 
-#: InvenTree/settings.py:536
+#: InvenTree/settings.py:542
 msgid "Swedish"
 msgstr ""
 
-#: InvenTree/settings.py:537
+#: InvenTree/settings.py:543
 msgid "Thai"
 msgstr ""
 
-#: InvenTree/settings.py:538
+#: InvenTree/settings.py:544
 msgid "Turkish"
 msgstr ""
 
-#: InvenTree/settings.py:539
+#: InvenTree/settings.py:545
 msgid "Vietnamese"
 msgstr ""
 
-#: InvenTree/settings.py:540
+#: InvenTree/settings.py:546
 msgid "Chinese"
 msgstr ""
 
@@ -458,27 +471,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:610
+#: InvenTree/views.py:616
 msgid "Delete Item"
 msgstr ""
 
-#: InvenTree/views.py:659
+#: InvenTree/views.py:665
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:674 templates/InvenTree/settings/user.html:14
+#: InvenTree/views.py:680 templates/InvenTree/settings/user.html:18
 msgid "Edit User Information"
 msgstr ""
 
-#: InvenTree/views.py:685 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:691 templates/InvenTree/settings/user.html:22
 msgid "Set Password"
 msgstr ""
 
-#: InvenTree/views.py:704
+#: InvenTree/views.py:710
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:910 templates/navbar.html:97
+#: InvenTree/views.py:954 templates/navbar.html:97
 msgid "System Information"
 msgstr ""
 
@@ -551,7 +564,7 @@ msgstr ""
 #: build/forms.py:48 build/forms.py:90 build/models.py:1281
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:1043
+#: build/templates/build/detail.html:34 common/models.py:1087
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:101 order/forms.py:123 order/models.py:720
 #: order/models.py:982 order/templates/order/order_wizard/match_parts.html:30
@@ -681,8 +694,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:50
 #: part/templates/part/navbar.html:53 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:171
-#: templates/InvenTree/settings/navbar.html:107
-#: templates/InvenTree/settings/navbar.html:109 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1541,7 +1554,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:308 common/models.py:843 common/models.py:1004
+#: common/models.py:308 common/models.py:887 common/models.py:1048
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1955,196 +1968,252 @@ msgstr ""
 msgid "Enable PO functionality in InvenTree interface"
 msgstr ""
 
+#: common/models.py:836
+msgid "Enable password forgot"
+msgstr ""
+
+#: common/models.py:837
+msgid "Enable password forgot function on the login-pages"
+msgstr ""
+
+#: common/models.py:842
+msgid "Enable registration"
+msgstr ""
+
+#: common/models.py:843
+msgid "Enable self-registration for users on the login-pages"
+msgstr ""
+
+#: common/models.py:848
+msgid "Enable SSO"
+msgstr ""
+
+#: common/models.py:849
+msgid "Enable SSO on the login-pages"
+msgstr ""
+
 #: common/models.py:854
-msgid "Show starred parts"
+msgid "E-Mail required"
 msgstr ""
 
 #: common/models.py:855
-msgid "Show starred parts on the homepage"
+msgid "Require user to supply mail on signup"
 msgstr ""
 
 #: common/models.py:860
-msgid "Show latest parts"
+msgid "Auto-fill SSO users"
 msgstr ""
 
 #: common/models.py:861
-msgid "Show latest parts on the homepage"
+msgid "Automatically fill out user-details from SSO account-data"
 msgstr ""
 
 #: common/models.py:866
-msgid "Recent Part Count"
+msgid "Mail twice"
 msgstr ""
 
 #: common/models.py:867
-msgid "Number of recent parts to display on index page"
+msgid "On signup ask users twice for their mail"
+msgstr ""
+
+#: common/models.py:872
+msgid "Password twice"
 msgstr ""
 
 #: common/models.py:873
-msgid "Show unvalidated BOMs"
-msgstr ""
-
-#: common/models.py:874
-msgid "Show BOMs that await validation on the homepage"
-msgstr ""
-
-#: common/models.py:879
-msgid "Show recent stock changes"
-msgstr ""
-
-#: common/models.py:880
-msgid "Show recently changed stock items on the homepage"
-msgstr ""
-
-#: common/models.py:885
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:886
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:891
-msgid "Show low stock"
-msgstr ""
-
-#: common/models.py:892
-msgid "Show low stock items on the homepage"
-msgstr ""
-
-#: common/models.py:897
-msgid "Show depleted stock"
+msgid "On signup ask users twice for their password"
 msgstr ""
 
 #: common/models.py:898
-msgid "Show depleted stock items on the homepage"
+msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:903
-msgid "Show needed stock"
+#: common/models.py:899
+msgid "Show starred parts on the homepage"
 msgstr ""
 
 #: common/models.py:904
-msgid "Show stock items needed for builds on the homepage"
+msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:909
-msgid "Show expired stock"
+#: common/models.py:905
+msgid "Show latest parts on the homepage"
 msgstr ""
 
 #: common/models.py:910
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:911
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:917
+msgid "Show unvalidated BOMs"
+msgstr ""
+
+#: common/models.py:918
+msgid "Show BOMs that await validation on the homepage"
+msgstr ""
+
+#: common/models.py:923
+msgid "Show recent stock changes"
+msgstr ""
+
+#: common/models.py:924
+msgid "Show recently changed stock items on the homepage"
+msgstr ""
+
+#: common/models.py:929
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:930
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:935
+msgid "Show low stock"
+msgstr ""
+
+#: common/models.py:936
+msgid "Show low stock items on the homepage"
+msgstr ""
+
+#: common/models.py:941
+msgid "Show depleted stock"
+msgstr ""
+
+#: common/models.py:942
+msgid "Show depleted stock items on the homepage"
+msgstr ""
+
+#: common/models.py:947
+msgid "Show needed stock"
+msgstr ""
+
+#: common/models.py:948
+msgid "Show stock items needed for builds on the homepage"
+msgstr ""
+
+#: common/models.py:953
+msgid "Show expired stock"
+msgstr ""
+
+#: common/models.py:954
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:915
+#: common/models.py:959
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:916
+#: common/models.py:960
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:921
+#: common/models.py:965
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:922
+#: common/models.py:966
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:927
+#: common/models.py:971
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:928
+#: common/models.py:972
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:933
+#: common/models.py:977
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:934
+#: common/models.py:978
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:939
+#: common/models.py:983
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:940
+#: common/models.py:984
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:945
+#: common/models.py:989
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:946
+#: common/models.py:990
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:951
+#: common/models.py:995
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:952
+#: common/models.py:996
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:958
+#: common/models.py:1002
 msgid "Inline label display"
 msgstr ""
 
-#: common/models.py:959
+#: common/models.py:1003
 msgid "Display PDF labels in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:965
+#: common/models.py:1009
 msgid "Inline report display"
 msgstr ""
 
-#: common/models.py:966
+#: common/models.py:1010
 msgid "Display PDF reports in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:972
+#: common/models.py:1016
 msgid "Search Preview Results"
 msgstr ""
 
-#: common/models.py:973
+#: common/models.py:1017
 msgid "Number of results to show in search preview window"
 msgstr ""
 
-#: common/models.py:979
+#: common/models.py:1023
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:980
+#: common/models.py:1024
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:986
+#: common/models.py:1030
 msgid "Escape Key Closes Forms"
 msgstr ""
 
-#: common/models.py:987
+#: common/models.py:1031
 msgid "Use the escape key to close modal forms"
 msgstr ""
 
-#: common/models.py:1044 company/forms.py:43
+#: common/models.py:1088 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:1051 company/templates/company/supplier_part.html:231
+#: common/models.py:1095 company/templates/company/supplier_part.html:231
 #: templates/js/translated/part.js:1369
 msgid "Price"
 msgstr ""
 
-#: common/models.py:1052
+#: common/models.py:1096
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1145
+#: common/models.py:1189
 msgid "Default"
 msgstr ""
 
@@ -2593,8 +2662,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:82
 #: part/templates/part/navbar.html:85 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:229
-#: templates/InvenTree/settings/navbar.html:113
-#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:119
+#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:44
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2617,8 +2686,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:91
 #: part/templates/part/navbar.html:94 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:249
-#: templates/InvenTree/settings/navbar.html:119
-#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:55
+#: templates/InvenTree/settings/navbar.html:125
+#: templates/InvenTree/settings/navbar.html:127 templates/navbar.html:55
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2704,7 +2773,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part.html:239
 #: part/templates/part/detail.html:214 part/templates/part/detail.html:294
 #: part/templates/part/detail.html:317 templates/js/translated/company.js:424
-#: templates/js/translated/helpers.js:31 users/models.py:194
+#: templates/js/translated/helpers.js:31 users/models.py:199
 msgid "Delete"
 msgstr ""
 
@@ -2753,8 +2822,8 @@ msgstr ""
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:182
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109
 #: templates/js/translated/part.js:540 templates/js/translated/part.js:769
 #: templates/js/translated/part.js:945 templates/js/translated/stock.js:182
 #: templates/js/translated/stock.js:829 templates/navbar.html:32
@@ -3712,8 +3781,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
 #: templates/js/translated/part.js:1165 templates/navbar.html:29
 #: templates/stats.html:80 templates/stats.html:89 users/models.py:41
 msgid "Parts"
@@ -3927,7 +3996,7 @@ msgstr ""
 
 #: part/models.py:696 part/models.py:2299
 #: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:168
+#: templates/InvenTree/settings/settings.html:169
 #: templates/js/translated/part.js:927
 msgid "Category"
 msgstr ""
@@ -4117,7 +4186,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2256 part/models.py:2305 part/models.py:2306
-#: templates/InvenTree/settings/settings.html:163
+#: templates/InvenTree/settings/settings.html:164
 msgid "Parameter Template"
 msgstr ""
 
@@ -4129,7 +4198,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2310 templates/InvenTree/settings/settings.html:172
+#: part/models.py:2310 templates/InvenTree/settings/settings.html:173
 msgid "Default Value"
 msgstr ""
 
@@ -6143,6 +6212,14 @@ msgstr ""
 msgid "Setting"
 msgstr ""
 
+#: templates/InvenTree/settings/login.html:9
+msgid "Login Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/login.html:22 templates/account/signup.html:5
+msgid "Signup"
+msgstr ""
+
 #: templates/InvenTree/settings/navbar.html:12
 #: templates/InvenTree/settings/user_settings.html:9
 msgid "User Settings"
@@ -6196,22 +6273,27 @@ msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
-msgid "Barcodes"
+#: templates/InvenTree/settings/navbar.html:73 templates/navbar.html:87
+msgid "Login"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:77
 #: templates/InvenTree/settings/navbar.html:79
-msgid "Currencies"
+msgid "Barcodes"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:83
 #: templates/InvenTree/settings/navbar.html:85
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
 msgid "Reporting"
 msgstr ""
 
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103
 msgid "Categories"
 msgstr ""
 
@@ -6252,21 +6334,21 @@ msgstr ""
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:153
+#: templates/InvenTree/settings/settings.html:154
 msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:175
-#: templates/InvenTree/settings/settings.html:274
-msgid "Edit Template"
-msgstr ""
-
 #: templates/InvenTree/settings/settings.html:176
 #: templates/InvenTree/settings/settings.html:275
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/settings.html:177
+#: templates/InvenTree/settings/settings.html:276
 msgid "Delete Template"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:254
+#: templates/InvenTree/settings/settings.html:255
 msgid "No part parameter templates found"
 msgstr ""
 
@@ -6278,70 +6360,136 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:9
+#: templates/InvenTree/settings/user.html:11
 msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:15
+#: templates/InvenTree/settings/user.html:19
 #: templates/js/translated/helpers.js:26
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:17
+#: templates/InvenTree/settings/user.html:21
+#: templates/account/password_reset_from_key.html:4
+#: templates/account/password_reset_from_key.html:7
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:24
-#: templates/registration/login.html:58
+#: templates/InvenTree/settings/user.html:28
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:32
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:36
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
-msgid "Email Address"
+#: templates/InvenTree/settings/user.html:42
+msgid "E-Mail"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:42
-msgid "Theme Settings"
+#: templates/InvenTree/settings/user.html:47
+msgid "The following e-mail addresses are associated with your account:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:61
+msgid "Verified"
 msgstr ""
 
 #: templates/InvenTree/settings/user.html:63
+msgid "Unverified"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:65
+msgid "Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:71
+msgid "Make Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:72
+msgid "Re-send Verification"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:73
+#: templates/InvenTree/settings/user.html:130
+msgid "Remove"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:80
+msgid "Warning:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:81
+msgid "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."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:88
+msgid "Add E-mail Address"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:93
+msgid "Add E-mail"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:100
+msgid "Social Accounts"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:105
+msgid "You can sign in to your account using any of the following third party accounts:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:138
+msgid "You currently have no social network accounts connected to this account."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:142
+msgid "Add a 3rd Party Account"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:153
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:174
 msgid "Set Theme"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:70
+#: templates/InvenTree/settings/user.html:181
 msgid "Language Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:89
+#: templates/InvenTree/settings/user.html:200
 #, python-format
 msgid "%(lang_translated)s%% translated"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:91
+#: templates/InvenTree/settings/user.html:202
 msgid "No translations available"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:98
+#: templates/InvenTree/settings/user.html:209
 msgid "Set Language"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:103
+#: templates/InvenTree/settings/user.html:214
 msgid "Help the translation efforts!"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:104
+#: templates/InvenTree/settings/user.html:215
 #, python-format
 msgid "Native language translation of the InvenTree web application is <a href=\"%(link)s\">community contributed via crowdin</a>. Contributions are welcomed and encouraged."
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:223
+msgid "Do you really want to remove the selected e-mail address?"
+msgstr ""
+
 #: templates/InvenTree/settings/user_forms.html:9
 msgid "Form Settings"
 msgstr ""
@@ -6433,6 +6581,105 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#: templates/account/email_confirm.html:6
+#: templates/account/email_confirm.html:10
+msgid "Confirm E-mail Address"
+msgstr ""
+
+#: templates/account/email_confirm.html:16
+#, python-format
+msgid "Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail address for user %(user_display)s."
+msgstr ""
+
+#: templates/account/email_confirm.html:27
+#, python-format
+msgid "This e-mail confirmation link expired or is invalid. Please <a href=\"%(email_url)s\">issue a new e-mail confirmation request</a>."
+msgstr ""
+
+#: templates/account/login.html:5 templates/account/login.html:14
+#: templates/account/login.html:36
+msgid "Sign In"
+msgstr ""
+
+#: templates/account/login.html:19
+#, python-format
+msgid ""
+"Please sign in with one\n"
+"of your existing third party accounts or  <a class=\"btn btn-primary btn-small\" href=\"%(signup_url)s\">sign up</a>\n"
+"for a account and sign in below:"
+msgstr ""
+
+#: templates/account/login.html:23
+#, python-format
+msgid ""
+"If you have not created an account yet, then please\n"
+"<a href=\"%(signup_url)s\">sign up</a> first."
+msgstr ""
+
+#: templates/account/login.html:38
+msgid "Forgot Password?"
+msgstr ""
+
+#: templates/account/login.html:45
+msgid "or use SSO"
+msgstr ""
+
+#: templates/account/logout.html:5 templates/account/logout.html:8
+#: templates/account/logout.html:17
+msgid "Sign Out"
+msgstr ""
+
+#: templates/account/logout.html:10
+msgid "Are you sure you want to sign out?"
+msgstr ""
+
+#: templates/account/password_reset.html:5
+#: templates/account/password_reset.html:12
+msgid "Password Reset"
+msgstr ""
+
+#: templates/account/password_reset.html:18
+msgid "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it."
+msgstr ""
+
+#: templates/account/password_reset.html:23
+msgid "Reset My Password"
+msgstr ""
+
+#: templates/account/password_reset.html:27 templates/account/signup.html:36
+msgid "This function is currently disabled. Please contact an administrator."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:7
+msgid "Bad Token"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:11
+#, python-format
+msgid "The password reset link was invalid, possibly because it has already been used.  Please request a <a href=\"%(passwd_reset_url)s\">new password reset</a>."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:17
+msgid "change password"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:20
+msgid "Your password is now changed."
+msgstr ""
+
+#: templates/account/signup.html:11 templates/account/signup.html:22
+msgid "Sign Up"
+msgstr ""
+
+#: templates/account/signup.html:13
+#, python-format
+msgid "Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>."
+msgstr ""
+
+#: templates/account/signup.html:27
+msgid "Or use a SSO-provider for signup"
+msgstr ""
+
 #: templates/image_download.html:8
 msgid "Specify URL for downloading image"
 msgstr ""
@@ -7566,7 +7813,7 @@ msgstr ""
 msgid "Add Stock"
 msgstr ""
 
-#: templates/js/translated/stock.js:165 users/models.py:190
+#: templates/js/translated/stock.js:165 users/models.py:195
 msgid "Add"
 msgstr ""
 
@@ -8023,10 +8270,6 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: templates/navbar.html:87 templates/registration/login.html:89
-msgid "Login"
-msgstr ""
-
 #: templates/navbar.html:106
 msgid "About InvenTree"
 msgstr ""
@@ -8035,68 +8278,12 @@ msgstr ""
 msgid "QR data not provided"
 msgstr ""
 
-#: templates/registration/logged_out.html:50
-msgid "You have been logged out"
+#: templates/registration/logged_out.html:6
+msgid "You were logged out successfully."
 msgstr ""
 
-#: templates/registration/logged_out.html:51
-#: templates/registration/password_reset_complete.html:51
-#: templates/registration/password_reset_done.html:58
-msgid "Return to login screen"
-msgstr ""
-
-#: templates/registration/login.html:64
-msgid "Enter username"
-msgstr ""
-
-#: templates/registration/login.html:70
-msgid "Password"
-msgstr ""
-
-#: templates/registration/login.html:83
-msgid "Username / password combination is incorrect"
-msgstr ""
-
-#: templates/registration/login.html:95
-#: templates/registration/password_reset_form.html:51
-msgid "Forgotten your password?"
-msgstr ""
-
-#: templates/registration/login.html:95
-msgid "Click here to reset"
-msgstr ""
-
-#: templates/registration/password_reset_complete.html:50
-msgid "Password reset complete"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:52
-#: templates/registration/password_reset_confirm.html:56
-msgid "Change password"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:60
-msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:51
-msgid "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:54
-msgid "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:52
-msgid "Enter your email address below."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:53
-msgid "An email will be sent with password reset instructions."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:58
-msgid "Send email"
+#: templates/registration/logged_out.html:8
+msgid "Log in again"
 msgstr ""
 
 #: templates/stats.html:13
@@ -8235,34 +8422,34 @@ msgstr ""
 msgid "Important dates"
 msgstr ""
 
-#: users/models.py:177
+#: users/models.py:182
 msgid "Permission set"
 msgstr ""
 
-#: users/models.py:185
+#: users/models.py:190
 msgid "Group"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "View"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "Permission to view items"
 msgstr ""
 
-#: users/models.py:190
+#: users/models.py:195
 msgid "Permission to add items"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Change"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Permissions to edit items"
 msgstr ""
 
-#: users/models.py:194
+#: users/models.py:199
 msgid "Permission to delete items"
 msgstr ""
diff --git a/InvenTree/locale/th/LC_MESSAGES/django.po b/InvenTree/locale/th/LC_MESSAGES/django.po
index 2f47c4e5a9..d2e69a4bef 100644
--- a/InvenTree/locale/th/LC_MESSAGES/django.po
+++ b/InvenTree/locale/th/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-11 01:01+0000\n"
+"POT-Creation-Date: 2021-10-11 06:21+0000\n"
 "PO-Revision-Date: 2021-09-12 13:44\n"
 "Last-Translator: \n"
 "Language-Team: Thai\n"
@@ -33,41 +33,54 @@ msgstr ""
 msgid "Enter date"
 msgstr ""
 
-#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:116 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:173 build/forms.py:215 order/forms.py:27
 #: order/forms.py:38 order/forms.py:49 order/forms.py:60 order/forms.py:71
-#: part/forms.py:108 templates/js/translated/forms.js:564
+#: part/forms.py:108 templates/account/email_confirm.html:20
+#: templates/js/translated/forms.js:564
 msgid "Confirm"
 msgstr ""
 
-#: InvenTree/forms.py:127
+#: InvenTree/forms.py:132
 msgid "Confirm delete"
 msgstr ""
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:133
 msgid "Confirm item deletion"
 msgstr ""
 
-#: InvenTree/forms.py:160 templates/registration/login.html:76
+#: InvenTree/forms.py:164
 msgid "Enter password"
 msgstr ""
 
-#: InvenTree/forms.py:161
+#: InvenTree/forms.py:165
 msgid "Enter new password"
 msgstr ""
 
-#: InvenTree/forms.py:168
+#: InvenTree/forms.py:172
 msgid "Confirm password"
 msgstr ""
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:173
 msgid "Confirm new password"
 msgstr ""
 
-#: InvenTree/forms.py:201
+#: InvenTree/forms.py:205
 msgid "Select Category"
 msgstr ""
 
+#: InvenTree/forms.py:226
+msgid "E-mail (again)"
+msgstr ""
+
+#: InvenTree/forms.py:230
+msgid "E-mail address confirmation"
+msgstr ""
+
+#: InvenTree/forms.py:250
+msgid "You must type the same email each time."
+msgstr ""
+
 #: InvenTree/helpers.py:401
 #, python-brace-format
 msgid "Duplicate serial: {n}"
@@ -118,8 +131,8 @@ msgstr ""
 msgid "File comment"
 msgstr ""
 
-#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1011
-#: common/models.py:1012 part/models.py:2055
+#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1055
+#: common/models.py:1056 part/models.py:2055
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/translated/stock.js:1669
 msgid "User"
@@ -205,75 +218,75 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: InvenTree/settings.py:523
+#: InvenTree/settings.py:529
 msgid "German"
 msgstr ""
 
-#: InvenTree/settings.py:524
+#: InvenTree/settings.py:530
 msgid "Greek"
 msgstr ""
 
-#: InvenTree/settings.py:525
+#: InvenTree/settings.py:531
 msgid "English"
 msgstr ""
 
-#: InvenTree/settings.py:526
+#: InvenTree/settings.py:532
 msgid "Spanish"
 msgstr ""
 
-#: InvenTree/settings.py:527
+#: InvenTree/settings.py:533
 msgid "French"
 msgstr ""
 
-#: InvenTree/settings.py:528
+#: InvenTree/settings.py:534
 msgid "Hebrew"
 msgstr ""
 
-#: InvenTree/settings.py:529
+#: InvenTree/settings.py:535
 msgid "Italian"
 msgstr ""
 
-#: InvenTree/settings.py:530
+#: InvenTree/settings.py:536
 msgid "Japanese"
 msgstr ""
 
-#: InvenTree/settings.py:531
+#: InvenTree/settings.py:537
 msgid "Korean"
 msgstr ""
 
-#: InvenTree/settings.py:532
+#: InvenTree/settings.py:538
 msgid "Dutch"
 msgstr ""
 
-#: InvenTree/settings.py:533
+#: InvenTree/settings.py:539
 msgid "Norwegian"
 msgstr ""
 
-#: InvenTree/settings.py:534
+#: InvenTree/settings.py:540
 msgid "Polish"
 msgstr ""
 
-#: InvenTree/settings.py:535
+#: InvenTree/settings.py:541
 msgid "Russian"
 msgstr ""
 
-#: InvenTree/settings.py:536
+#: InvenTree/settings.py:542
 msgid "Swedish"
 msgstr ""
 
-#: InvenTree/settings.py:537
+#: InvenTree/settings.py:543
 msgid "Thai"
 msgstr ""
 
-#: InvenTree/settings.py:538
+#: InvenTree/settings.py:544
 msgid "Turkish"
 msgstr ""
 
-#: InvenTree/settings.py:539
+#: InvenTree/settings.py:545
 msgid "Vietnamese"
 msgstr ""
 
-#: InvenTree/settings.py:540
+#: InvenTree/settings.py:546
 msgid "Chinese"
 msgstr ""
 
@@ -458,27 +471,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:610
+#: InvenTree/views.py:616
 msgid "Delete Item"
 msgstr ""
 
-#: InvenTree/views.py:659
+#: InvenTree/views.py:665
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:674 templates/InvenTree/settings/user.html:14
+#: InvenTree/views.py:680 templates/InvenTree/settings/user.html:18
 msgid "Edit User Information"
 msgstr ""
 
-#: InvenTree/views.py:685 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:691 templates/InvenTree/settings/user.html:22
 msgid "Set Password"
 msgstr ""
 
-#: InvenTree/views.py:704
+#: InvenTree/views.py:710
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:910 templates/navbar.html:97
+#: InvenTree/views.py:954 templates/navbar.html:97
 msgid "System Information"
 msgstr ""
 
@@ -551,7 +564,7 @@ msgstr ""
 #: build/forms.py:48 build/forms.py:90 build/models.py:1281
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:1043
+#: build/templates/build/detail.html:34 common/models.py:1087
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:101 order/forms.py:123 order/models.py:720
 #: order/models.py:982 order/templates/order/order_wizard/match_parts.html:30
@@ -681,8 +694,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:50
 #: part/templates/part/navbar.html:53 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:171
-#: templates/InvenTree/settings/navbar.html:107
-#: templates/InvenTree/settings/navbar.html:109 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1541,7 +1554,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:308 common/models.py:843 common/models.py:1004
+#: common/models.py:308 common/models.py:887 common/models.py:1048
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1955,196 +1968,252 @@ msgstr ""
 msgid "Enable PO functionality in InvenTree interface"
 msgstr ""
 
+#: common/models.py:836
+msgid "Enable password forgot"
+msgstr ""
+
+#: common/models.py:837
+msgid "Enable password forgot function on the login-pages"
+msgstr ""
+
+#: common/models.py:842
+msgid "Enable registration"
+msgstr ""
+
+#: common/models.py:843
+msgid "Enable self-registration for users on the login-pages"
+msgstr ""
+
+#: common/models.py:848
+msgid "Enable SSO"
+msgstr ""
+
+#: common/models.py:849
+msgid "Enable SSO on the login-pages"
+msgstr ""
+
 #: common/models.py:854
-msgid "Show starred parts"
+msgid "E-Mail required"
 msgstr ""
 
 #: common/models.py:855
-msgid "Show starred parts on the homepage"
+msgid "Require user to supply mail on signup"
 msgstr ""
 
 #: common/models.py:860
-msgid "Show latest parts"
+msgid "Auto-fill SSO users"
 msgstr ""
 
 #: common/models.py:861
-msgid "Show latest parts on the homepage"
+msgid "Automatically fill out user-details from SSO account-data"
 msgstr ""
 
 #: common/models.py:866
-msgid "Recent Part Count"
+msgid "Mail twice"
 msgstr ""
 
 #: common/models.py:867
-msgid "Number of recent parts to display on index page"
+msgid "On signup ask users twice for their mail"
+msgstr ""
+
+#: common/models.py:872
+msgid "Password twice"
 msgstr ""
 
 #: common/models.py:873
-msgid "Show unvalidated BOMs"
-msgstr ""
-
-#: common/models.py:874
-msgid "Show BOMs that await validation on the homepage"
-msgstr ""
-
-#: common/models.py:879
-msgid "Show recent stock changes"
-msgstr ""
-
-#: common/models.py:880
-msgid "Show recently changed stock items on the homepage"
-msgstr ""
-
-#: common/models.py:885
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:886
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:891
-msgid "Show low stock"
-msgstr ""
-
-#: common/models.py:892
-msgid "Show low stock items on the homepage"
-msgstr ""
-
-#: common/models.py:897
-msgid "Show depleted stock"
+msgid "On signup ask users twice for their password"
 msgstr ""
 
 #: common/models.py:898
-msgid "Show depleted stock items on the homepage"
+msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:903
-msgid "Show needed stock"
+#: common/models.py:899
+msgid "Show starred parts on the homepage"
 msgstr ""
 
 #: common/models.py:904
-msgid "Show stock items needed for builds on the homepage"
+msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:909
-msgid "Show expired stock"
+#: common/models.py:905
+msgid "Show latest parts on the homepage"
 msgstr ""
 
 #: common/models.py:910
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:911
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:917
+msgid "Show unvalidated BOMs"
+msgstr ""
+
+#: common/models.py:918
+msgid "Show BOMs that await validation on the homepage"
+msgstr ""
+
+#: common/models.py:923
+msgid "Show recent stock changes"
+msgstr ""
+
+#: common/models.py:924
+msgid "Show recently changed stock items on the homepage"
+msgstr ""
+
+#: common/models.py:929
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:930
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:935
+msgid "Show low stock"
+msgstr ""
+
+#: common/models.py:936
+msgid "Show low stock items on the homepage"
+msgstr ""
+
+#: common/models.py:941
+msgid "Show depleted stock"
+msgstr ""
+
+#: common/models.py:942
+msgid "Show depleted stock items on the homepage"
+msgstr ""
+
+#: common/models.py:947
+msgid "Show needed stock"
+msgstr ""
+
+#: common/models.py:948
+msgid "Show stock items needed for builds on the homepage"
+msgstr ""
+
+#: common/models.py:953
+msgid "Show expired stock"
+msgstr ""
+
+#: common/models.py:954
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:915
+#: common/models.py:959
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:916
+#: common/models.py:960
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:921
+#: common/models.py:965
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:922
+#: common/models.py:966
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:927
+#: common/models.py:971
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:928
+#: common/models.py:972
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:933
+#: common/models.py:977
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:934
+#: common/models.py:978
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:939
+#: common/models.py:983
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:940
+#: common/models.py:984
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:945
+#: common/models.py:989
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:946
+#: common/models.py:990
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:951
+#: common/models.py:995
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:952
+#: common/models.py:996
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:958
+#: common/models.py:1002
 msgid "Inline label display"
 msgstr ""
 
-#: common/models.py:959
+#: common/models.py:1003
 msgid "Display PDF labels in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:965
+#: common/models.py:1009
 msgid "Inline report display"
 msgstr ""
 
-#: common/models.py:966
+#: common/models.py:1010
 msgid "Display PDF reports in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:972
+#: common/models.py:1016
 msgid "Search Preview Results"
 msgstr ""
 
-#: common/models.py:973
+#: common/models.py:1017
 msgid "Number of results to show in search preview window"
 msgstr ""
 
-#: common/models.py:979
+#: common/models.py:1023
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:980
+#: common/models.py:1024
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:986
+#: common/models.py:1030
 msgid "Escape Key Closes Forms"
 msgstr ""
 
-#: common/models.py:987
+#: common/models.py:1031
 msgid "Use the escape key to close modal forms"
 msgstr ""
 
-#: common/models.py:1044 company/forms.py:43
+#: common/models.py:1088 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:1051 company/templates/company/supplier_part.html:231
+#: common/models.py:1095 company/templates/company/supplier_part.html:231
 #: templates/js/translated/part.js:1369
 msgid "Price"
 msgstr ""
 
-#: common/models.py:1052
+#: common/models.py:1096
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1145
+#: common/models.py:1189
 msgid "Default"
 msgstr ""
 
@@ -2593,8 +2662,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:82
 #: part/templates/part/navbar.html:85 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:229
-#: templates/InvenTree/settings/navbar.html:113
-#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:119
+#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:44
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2617,8 +2686,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:91
 #: part/templates/part/navbar.html:94 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:249
-#: templates/InvenTree/settings/navbar.html:119
-#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:55
+#: templates/InvenTree/settings/navbar.html:125
+#: templates/InvenTree/settings/navbar.html:127 templates/navbar.html:55
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2704,7 +2773,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part.html:239
 #: part/templates/part/detail.html:214 part/templates/part/detail.html:294
 #: part/templates/part/detail.html:317 templates/js/translated/company.js:424
-#: templates/js/translated/helpers.js:31 users/models.py:194
+#: templates/js/translated/helpers.js:31 users/models.py:199
 msgid "Delete"
 msgstr ""
 
@@ -2753,8 +2822,8 @@ msgstr ""
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:182
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109
 #: templates/js/translated/part.js:540 templates/js/translated/part.js:769
 #: templates/js/translated/part.js:945 templates/js/translated/stock.js:182
 #: templates/js/translated/stock.js:829 templates/navbar.html:32
@@ -3712,8 +3781,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
 #: templates/js/translated/part.js:1165 templates/navbar.html:29
 #: templates/stats.html:80 templates/stats.html:89 users/models.py:41
 msgid "Parts"
@@ -3927,7 +3996,7 @@ msgstr ""
 
 #: part/models.py:696 part/models.py:2299
 #: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:168
+#: templates/InvenTree/settings/settings.html:169
 #: templates/js/translated/part.js:927
 msgid "Category"
 msgstr ""
@@ -4117,7 +4186,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2256 part/models.py:2305 part/models.py:2306
-#: templates/InvenTree/settings/settings.html:163
+#: templates/InvenTree/settings/settings.html:164
 msgid "Parameter Template"
 msgstr ""
 
@@ -4129,7 +4198,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2310 templates/InvenTree/settings/settings.html:172
+#: part/models.py:2310 templates/InvenTree/settings/settings.html:173
 msgid "Default Value"
 msgstr ""
 
@@ -6143,6 +6212,14 @@ msgstr ""
 msgid "Setting"
 msgstr ""
 
+#: templates/InvenTree/settings/login.html:9
+msgid "Login Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/login.html:22 templates/account/signup.html:5
+msgid "Signup"
+msgstr ""
+
 #: templates/InvenTree/settings/navbar.html:12
 #: templates/InvenTree/settings/user_settings.html:9
 msgid "User Settings"
@@ -6196,22 +6273,27 @@ msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
-msgid "Barcodes"
+#: templates/InvenTree/settings/navbar.html:73 templates/navbar.html:87
+msgid "Login"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:77
 #: templates/InvenTree/settings/navbar.html:79
-msgid "Currencies"
+msgid "Barcodes"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:83
 #: templates/InvenTree/settings/navbar.html:85
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
 msgid "Reporting"
 msgstr ""
 
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103
 msgid "Categories"
 msgstr ""
 
@@ -6252,21 +6334,21 @@ msgstr ""
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:153
+#: templates/InvenTree/settings/settings.html:154
 msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:175
-#: templates/InvenTree/settings/settings.html:274
-msgid "Edit Template"
-msgstr ""
-
 #: templates/InvenTree/settings/settings.html:176
 #: templates/InvenTree/settings/settings.html:275
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/settings.html:177
+#: templates/InvenTree/settings/settings.html:276
 msgid "Delete Template"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:254
+#: templates/InvenTree/settings/settings.html:255
 msgid "No part parameter templates found"
 msgstr ""
 
@@ -6278,70 +6360,136 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:9
+#: templates/InvenTree/settings/user.html:11
 msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:15
+#: templates/InvenTree/settings/user.html:19
 #: templates/js/translated/helpers.js:26
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:17
+#: templates/InvenTree/settings/user.html:21
+#: templates/account/password_reset_from_key.html:4
+#: templates/account/password_reset_from_key.html:7
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:24
-#: templates/registration/login.html:58
+#: templates/InvenTree/settings/user.html:28
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:32
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:36
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
-msgid "Email Address"
+#: templates/InvenTree/settings/user.html:42
+msgid "E-Mail"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:42
-msgid "Theme Settings"
+#: templates/InvenTree/settings/user.html:47
+msgid "The following e-mail addresses are associated with your account:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:61
+msgid "Verified"
 msgstr ""
 
 #: templates/InvenTree/settings/user.html:63
+msgid "Unverified"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:65
+msgid "Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:71
+msgid "Make Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:72
+msgid "Re-send Verification"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:73
+#: templates/InvenTree/settings/user.html:130
+msgid "Remove"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:80
+msgid "Warning:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:81
+msgid "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."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:88
+msgid "Add E-mail Address"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:93
+msgid "Add E-mail"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:100
+msgid "Social Accounts"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:105
+msgid "You can sign in to your account using any of the following third party accounts:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:138
+msgid "You currently have no social network accounts connected to this account."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:142
+msgid "Add a 3rd Party Account"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:153
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:174
 msgid "Set Theme"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:70
+#: templates/InvenTree/settings/user.html:181
 msgid "Language Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:89
+#: templates/InvenTree/settings/user.html:200
 #, python-format
 msgid "%(lang_translated)s%% translated"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:91
+#: templates/InvenTree/settings/user.html:202
 msgid "No translations available"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:98
+#: templates/InvenTree/settings/user.html:209
 msgid "Set Language"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:103
+#: templates/InvenTree/settings/user.html:214
 msgid "Help the translation efforts!"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:104
+#: templates/InvenTree/settings/user.html:215
 #, python-format
 msgid "Native language translation of the InvenTree web application is <a href=\"%(link)s\">community contributed via crowdin</a>. Contributions are welcomed and encouraged."
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:223
+msgid "Do you really want to remove the selected e-mail address?"
+msgstr ""
+
 #: templates/InvenTree/settings/user_forms.html:9
 msgid "Form Settings"
 msgstr ""
@@ -6433,6 +6581,105 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#: templates/account/email_confirm.html:6
+#: templates/account/email_confirm.html:10
+msgid "Confirm E-mail Address"
+msgstr ""
+
+#: templates/account/email_confirm.html:16
+#, python-format
+msgid "Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail address for user %(user_display)s."
+msgstr ""
+
+#: templates/account/email_confirm.html:27
+#, python-format
+msgid "This e-mail confirmation link expired or is invalid. Please <a href=\"%(email_url)s\">issue a new e-mail confirmation request</a>."
+msgstr ""
+
+#: templates/account/login.html:5 templates/account/login.html:14
+#: templates/account/login.html:36
+msgid "Sign In"
+msgstr ""
+
+#: templates/account/login.html:19
+#, python-format
+msgid ""
+"Please sign in with one\n"
+"of your existing third party accounts or  <a class=\"btn btn-primary btn-small\" href=\"%(signup_url)s\">sign up</a>\n"
+"for a account and sign in below:"
+msgstr ""
+
+#: templates/account/login.html:23
+#, python-format
+msgid ""
+"If you have not created an account yet, then please\n"
+"<a href=\"%(signup_url)s\">sign up</a> first."
+msgstr ""
+
+#: templates/account/login.html:38
+msgid "Forgot Password?"
+msgstr ""
+
+#: templates/account/login.html:45
+msgid "or use SSO"
+msgstr ""
+
+#: templates/account/logout.html:5 templates/account/logout.html:8
+#: templates/account/logout.html:17
+msgid "Sign Out"
+msgstr ""
+
+#: templates/account/logout.html:10
+msgid "Are you sure you want to sign out?"
+msgstr ""
+
+#: templates/account/password_reset.html:5
+#: templates/account/password_reset.html:12
+msgid "Password Reset"
+msgstr ""
+
+#: templates/account/password_reset.html:18
+msgid "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it."
+msgstr ""
+
+#: templates/account/password_reset.html:23
+msgid "Reset My Password"
+msgstr ""
+
+#: templates/account/password_reset.html:27 templates/account/signup.html:36
+msgid "This function is currently disabled. Please contact an administrator."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:7
+msgid "Bad Token"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:11
+#, python-format
+msgid "The password reset link was invalid, possibly because it has already been used.  Please request a <a href=\"%(passwd_reset_url)s\">new password reset</a>."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:17
+msgid "change password"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:20
+msgid "Your password is now changed."
+msgstr ""
+
+#: templates/account/signup.html:11 templates/account/signup.html:22
+msgid "Sign Up"
+msgstr ""
+
+#: templates/account/signup.html:13
+#, python-format
+msgid "Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>."
+msgstr ""
+
+#: templates/account/signup.html:27
+msgid "Or use a SSO-provider for signup"
+msgstr ""
+
 #: templates/image_download.html:8
 msgid "Specify URL for downloading image"
 msgstr ""
@@ -7566,7 +7813,7 @@ msgstr ""
 msgid "Add Stock"
 msgstr ""
 
-#: templates/js/translated/stock.js:165 users/models.py:190
+#: templates/js/translated/stock.js:165 users/models.py:195
 msgid "Add"
 msgstr ""
 
@@ -8023,10 +8270,6 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: templates/navbar.html:87 templates/registration/login.html:89
-msgid "Login"
-msgstr ""
-
 #: templates/navbar.html:106
 msgid "About InvenTree"
 msgstr ""
@@ -8035,68 +8278,12 @@ msgstr ""
 msgid "QR data not provided"
 msgstr ""
 
-#: templates/registration/logged_out.html:50
-msgid "You have been logged out"
+#: templates/registration/logged_out.html:6
+msgid "You were logged out successfully."
 msgstr ""
 
-#: templates/registration/logged_out.html:51
-#: templates/registration/password_reset_complete.html:51
-#: templates/registration/password_reset_done.html:58
-msgid "Return to login screen"
-msgstr ""
-
-#: templates/registration/login.html:64
-msgid "Enter username"
-msgstr ""
-
-#: templates/registration/login.html:70
-msgid "Password"
-msgstr ""
-
-#: templates/registration/login.html:83
-msgid "Username / password combination is incorrect"
-msgstr ""
-
-#: templates/registration/login.html:95
-#: templates/registration/password_reset_form.html:51
-msgid "Forgotten your password?"
-msgstr ""
-
-#: templates/registration/login.html:95
-msgid "Click here to reset"
-msgstr ""
-
-#: templates/registration/password_reset_complete.html:50
-msgid "Password reset complete"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:52
-#: templates/registration/password_reset_confirm.html:56
-msgid "Change password"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:60
-msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:51
-msgid "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:54
-msgid "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:52
-msgid "Enter your email address below."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:53
-msgid "An email will be sent with password reset instructions."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:58
-msgid "Send email"
+#: templates/registration/logged_out.html:8
+msgid "Log in again"
 msgstr ""
 
 #: templates/stats.html:13
@@ -8235,34 +8422,34 @@ msgstr ""
 msgid "Important dates"
 msgstr ""
 
-#: users/models.py:177
+#: users/models.py:182
 msgid "Permission set"
 msgstr ""
 
-#: users/models.py:185
+#: users/models.py:190
 msgid "Group"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "View"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "Permission to view items"
 msgstr ""
 
-#: users/models.py:190
+#: users/models.py:195
 msgid "Permission to add items"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Change"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Permissions to edit items"
 msgstr ""
 
-#: users/models.py:194
+#: users/models.py:199
 msgid "Permission to delete items"
 msgstr ""
diff --git a/InvenTree/locale/tr/LC_MESSAGES/django.po b/InvenTree/locale/tr/LC_MESSAGES/django.po
index de89e466cc..bc2193b279 100644
--- a/InvenTree/locale/tr/LC_MESSAGES/django.po
+++ b/InvenTree/locale/tr/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-11 01:01+0000\n"
+"POT-Creation-Date: 2021-10-11 06:21+0000\n"
 "PO-Revision-Date: 2021-09-12 13:44\n"
 "Last-Translator: \n"
 "Language-Team: Turkish\n"
@@ -33,41 +33,56 @@ msgstr "Eşleşen eylem bulunamadı"
 msgid "Enter date"
 msgstr "Tarih giriniz"
 
-#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:116 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:173 build/forms.py:215 order/forms.py:27
 #: order/forms.py:38 order/forms.py:49 order/forms.py:60 order/forms.py:71
-#: part/forms.py:108 templates/js/translated/forms.js:564
+#: part/forms.py:108 templates/account/email_confirm.html:20
+#: templates/js/translated/forms.js:564
 msgid "Confirm"
 msgstr "Onay"
 
-#: InvenTree/forms.py:127
+#: InvenTree/forms.py:132
 msgid "Confirm delete"
 msgstr "Silmeyi Onayla"
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:133
 msgid "Confirm item deletion"
 msgstr "Silmeyi onayla"
 
-#: InvenTree/forms.py:160 templates/registration/login.html:76
+#: InvenTree/forms.py:164
 msgid "Enter password"
 msgstr "Şifrenizi girin"
 
-#: InvenTree/forms.py:161
+#: InvenTree/forms.py:165
 msgid "Enter new password"
 msgstr "Lütfen Yeni Parolayı Girin"
 
-#: InvenTree/forms.py:168
+#: InvenTree/forms.py:172
 msgid "Confirm password"
 msgstr "Parolayı doğrulayın"
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:173
 msgid "Confirm new password"
 msgstr "Yeni parolayı doğrulayın"
 
-#: InvenTree/forms.py:201
+#: InvenTree/forms.py:205
 msgid "Select Category"
 msgstr "Kategori Seçin"
 
+#: InvenTree/forms.py:226
+msgid "E-mail (again)"
+msgstr ""
+
+#: InvenTree/forms.py:230
+#, fuzzy
+#| msgid "Email Address"
+msgid "E-mail address confirmation"
+msgstr "E-Posta Adresi"
+
+#: InvenTree/forms.py:250
+msgid "You must type the same email each time."
+msgstr ""
+
 #: InvenTree/helpers.py:401
 #, python-brace-format
 msgid "Duplicate serial: {n}"
@@ -118,8 +133,8 @@ msgstr "Yorum"
 msgid "File comment"
 msgstr "Dosya yorumu"
 
-#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1011
-#: common/models.py:1012 part/models.py:2055
+#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1055
+#: common/models.py:1056 part/models.py:2055
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/translated/stock.js:1669
 msgid "User"
@@ -205,75 +220,75 @@ msgstr "Geçerli bir numara olmalı"
 msgid "Filename"
 msgstr ""
 
-#: InvenTree/settings.py:523
+#: InvenTree/settings.py:529
 msgid "German"
 msgstr "Almanca"
 
-#: InvenTree/settings.py:524
+#: InvenTree/settings.py:530
 msgid "Greek"
 msgstr "Yunanca"
 
-#: InvenTree/settings.py:525
+#: InvenTree/settings.py:531
 msgid "English"
 msgstr "İngilizce"
 
-#: InvenTree/settings.py:526
+#: InvenTree/settings.py:532
 msgid "Spanish"
 msgstr "İspanyolca"
 
-#: InvenTree/settings.py:527
+#: InvenTree/settings.py:533
 msgid "French"
 msgstr "Fransızca"
 
-#: InvenTree/settings.py:528
+#: InvenTree/settings.py:534
 msgid "Hebrew"
 msgstr "İbranice"
 
-#: InvenTree/settings.py:529
+#: InvenTree/settings.py:535
 msgid "Italian"
 msgstr "İtalyanca"
 
-#: InvenTree/settings.py:530
+#: InvenTree/settings.py:536
 msgid "Japanese"
 msgstr "Japonca"
 
-#: InvenTree/settings.py:531
+#: InvenTree/settings.py:537
 msgid "Korean"
 msgstr "Korece"
 
-#: InvenTree/settings.py:532
+#: InvenTree/settings.py:538
 msgid "Dutch"
 msgstr "Flemenkçe"
 
-#: InvenTree/settings.py:533
+#: InvenTree/settings.py:539
 msgid "Norwegian"
 msgstr "Norveççe"
 
-#: InvenTree/settings.py:534
+#: InvenTree/settings.py:540
 msgid "Polish"
 msgstr "Polonyaca"
 
-#: InvenTree/settings.py:535
+#: InvenTree/settings.py:541
 msgid "Russian"
 msgstr "Rusça"
 
-#: InvenTree/settings.py:536
+#: InvenTree/settings.py:542
 msgid "Swedish"
 msgstr "İsveççe"
 
-#: InvenTree/settings.py:537
+#: InvenTree/settings.py:543
 msgid "Thai"
 msgstr "Tay dili"
 
-#: InvenTree/settings.py:538
+#: InvenTree/settings.py:544
 msgid "Turkish"
 msgstr "Türkçe"
 
-#: InvenTree/settings.py:539
+#: InvenTree/settings.py:545
 msgid "Vietnamese"
 msgstr ""
 
-#: InvenTree/settings.py:540
+#: InvenTree/settings.py:546
 msgid "Chinese"
 msgstr "Çince"
 
@@ -458,27 +473,27 @@ msgstr "Fazlalık %100'ü geçmemelidir"
 msgid "Overage must be an integer value or a percentage"
 msgstr "Fazlalık bir tamsayı veya yüzde olmalıdır"
 
-#: InvenTree/views.py:610
+#: InvenTree/views.py:616
 msgid "Delete Item"
 msgstr "Ögeyi Sil"
 
-#: InvenTree/views.py:659
+#: InvenTree/views.py:665
 msgid "Check box to confirm item deletion"
 msgstr "Öge silme işlemini onaylamak için kutuyu işaretleyin"
 
-#: InvenTree/views.py:674 templates/InvenTree/settings/user.html:14
+#: InvenTree/views.py:680 templates/InvenTree/settings/user.html:18
 msgid "Edit User Information"
 msgstr "Kullanıcı Bilgisini Düzenle"
 
-#: InvenTree/views.py:685 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:691 templates/InvenTree/settings/user.html:22
 msgid "Set Password"
 msgstr "Şifre Belirle"
 
-#: InvenTree/views.py:704
+#: InvenTree/views.py:710
 msgid "Password fields must match"
 msgstr "Parola alanları eşleşmelidir"
 
-#: InvenTree/views.py:910 templates/navbar.html:97
+#: InvenTree/views.py:954 templates/navbar.html:97
 msgid "System Information"
 msgstr "Sistem Bilgisi"
 
@@ -551,7 +566,7 @@ msgstr "Yapım işinin tamamlanması için hedef tarih. Bu tarihten sonra yapım
 #: build/forms.py:48 build/forms.py:90 build/models.py:1281
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:1043
+#: build/templates/build/detail.html:34 common/models.py:1087
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:101 order/forms.py:123 order/models.py:720
 #: order/models.py:982 order/templates/order/order_wizard/match_parts.html:30
@@ -681,8 +696,8 @@ msgstr "Yapım İşi Emri"
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:50
 #: part/templates/part/navbar.html:53 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:171
-#: templates/InvenTree/settings/navbar.html:107
-#: templates/InvenTree/settings/navbar.html:109 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 users/models.py:44
 msgid "Build Orders"
 msgstr "Yapım İşi Emirleri"
 
@@ -1558,7 +1573,7 @@ msgstr "{name.title()} Dosya"
 msgid "Select {name} file to upload"
 msgstr "{name} dosyasını yüklemek için seçin"
 
-#: common/models.py:308 common/models.py:843 common/models.py:1004
+#: common/models.py:308 common/models.py:887 common/models.py:1048
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1974,196 +1989,262 @@ msgstr ""
 msgid "Enable PO functionality in InvenTree interface"
 msgstr ""
 
-#: common/models.py:854
-msgid "Show starred parts"
+#: common/models.py:836
+#, fuzzy
+#| msgid "Enter password"
+msgid "Enable password forgot"
+msgstr "Şifrenizi girin"
+
+#: common/models.py:837
+msgid "Enable password forgot function on the login-pages"
 msgstr ""
 
+#: common/models.py:842
+#, fuzzy
+#| msgid "Label description"
+msgid "Enable registration"
+msgstr "Etiket tanımı"
+
+#: common/models.py:843
+msgid "Enable self-registration for users on the login-pages"
+msgstr ""
+
+#: common/models.py:848
+#, fuzzy
+#| msgid "Enabled"
+msgid "Enable SSO"
+msgstr "Etkin"
+
+#: common/models.py:849
+msgid "Enable SSO on the login-pages"
+msgstr ""
+
+#: common/models.py:854
+#, fuzzy
+#| msgid "Required"
+msgid "E-Mail required"
+msgstr "Gerekli"
+
 #: common/models.py:855
-msgid "Show starred parts on the homepage"
+msgid "Require user to supply mail on signup"
 msgstr ""
 
 #: common/models.py:860
-msgid "Show latest parts"
+msgid "Auto-fill SSO users"
 msgstr ""
 
 #: common/models.py:861
-msgid "Show latest parts on the homepage"
+msgid "Automatically fill out user-details from SSO account-data"
 msgstr ""
 
 #: common/models.py:866
-msgid "Recent Part Count"
+msgid "Mail twice"
 msgstr ""
 
 #: common/models.py:867
-msgid "Number of recent parts to display on index page"
+msgid "On signup ask users twice for their mail"
 msgstr ""
 
+#: common/models.py:872
+#, fuzzy
+#| msgid "Set Password"
+msgid "Password twice"
+msgstr "Şifre Belirle"
+
 #: common/models.py:873
-msgid "Show unvalidated BOMs"
-msgstr ""
-
-#: common/models.py:874
-msgid "Show BOMs that await validation on the homepage"
-msgstr ""
-
-#: common/models.py:879
-msgid "Show recent stock changes"
-msgstr ""
-
-#: common/models.py:880
-msgid "Show recently changed stock items on the homepage"
-msgstr ""
-
-#: common/models.py:885
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:886
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:891
-msgid "Show low stock"
-msgstr ""
-
-#: common/models.py:892
-msgid "Show low stock items on the homepage"
-msgstr ""
-
-#: common/models.py:897
-msgid "Show depleted stock"
+msgid "On signup ask users twice for their password"
 msgstr ""
 
 #: common/models.py:898
-msgid "Show depleted stock items on the homepage"
+msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:903
-msgid "Show needed stock"
+#: common/models.py:899
+msgid "Show starred parts on the homepage"
 msgstr ""
 
 #: common/models.py:904
-msgid "Show stock items needed for builds on the homepage"
+msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:909
-msgid "Show expired stock"
+#: common/models.py:905
+msgid "Show latest parts on the homepage"
 msgstr ""
 
 #: common/models.py:910
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:911
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:917
+msgid "Show unvalidated BOMs"
+msgstr ""
+
+#: common/models.py:918
+msgid "Show BOMs that await validation on the homepage"
+msgstr ""
+
+#: common/models.py:923
+msgid "Show recent stock changes"
+msgstr ""
+
+#: common/models.py:924
+msgid "Show recently changed stock items on the homepage"
+msgstr ""
+
+#: common/models.py:929
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:930
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:935
+msgid "Show low stock"
+msgstr ""
+
+#: common/models.py:936
+msgid "Show low stock items on the homepage"
+msgstr ""
+
+#: common/models.py:941
+msgid "Show depleted stock"
+msgstr ""
+
+#: common/models.py:942
+msgid "Show depleted stock items on the homepage"
+msgstr ""
+
+#: common/models.py:947
+msgid "Show needed stock"
+msgstr ""
+
+#: common/models.py:948
+msgid "Show stock items needed for builds on the homepage"
+msgstr ""
+
+#: common/models.py:953
+msgid "Show expired stock"
+msgstr ""
+
+#: common/models.py:954
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:915
+#: common/models.py:959
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:916
+#: common/models.py:960
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:921
+#: common/models.py:965
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:922
+#: common/models.py:966
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:927
+#: common/models.py:971
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:928
+#: common/models.py:972
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:933
+#: common/models.py:977
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:934
+#: common/models.py:978
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:939
+#: common/models.py:983
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:940
+#: common/models.py:984
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:945
+#: common/models.py:989
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:946
+#: common/models.py:990
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:951
+#: common/models.py:995
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:952
+#: common/models.py:996
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:958
+#: common/models.py:1002
 msgid "Inline label display"
 msgstr ""
 
-#: common/models.py:959
+#: common/models.py:1003
 msgid "Display PDF labels in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:965
+#: common/models.py:1009
 msgid "Inline report display"
 msgstr ""
 
-#: common/models.py:966
+#: common/models.py:1010
 msgid "Display PDF reports in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:972
+#: common/models.py:1016
 msgid "Search Preview Results"
 msgstr ""
 
-#: common/models.py:973
+#: common/models.py:1017
 msgid "Number of results to show in search preview window"
 msgstr ""
 
-#: common/models.py:979
+#: common/models.py:1023
 msgid "Show Quantity in Forms"
 msgstr "Formlarda Miktarı Göster"
 
-#: common/models.py:980
+#: common/models.py:1024
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:986
+#: common/models.py:1030
 msgid "Escape Key Closes Forms"
 msgstr ""
 
-#: common/models.py:987
+#: common/models.py:1031
 msgid "Use the escape key to close modal forms"
 msgstr ""
 
-#: common/models.py:1044 company/forms.py:43
+#: common/models.py:1088 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:1051 company/templates/company/supplier_part.html:231
+#: common/models.py:1095 company/templates/company/supplier_part.html:231
 #: templates/js/translated/part.js:1369
 msgid "Price"
 msgstr "Fiyat"
 
-#: common/models.py:1052
+#: common/models.py:1096
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1145
+#: common/models.py:1189
 msgid "Default"
 msgstr "Varsayılan"
 
@@ -2612,8 +2693,8 @@ msgstr "Tedarikçi Stoku"
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:82
 #: part/templates/part/navbar.html:85 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:229
-#: templates/InvenTree/settings/navbar.html:113
-#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:119
+#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:44
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr "Satın Alma Emirleri"
@@ -2636,8 +2717,8 @@ msgstr "Yeni Satın Alma Emri"
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:91
 #: part/templates/part/navbar.html:94 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:249
-#: templates/InvenTree/settings/navbar.html:119
-#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:55
+#: templates/InvenTree/settings/navbar.html:125
+#: templates/InvenTree/settings/navbar.html:127 templates/navbar.html:55
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr "Satış Emirleri"
@@ -2723,7 +2804,7 @@ msgstr "Tedarikçi parçalarını sil"
 #: company/templates/company/manufacturer_part.html:239
 #: part/templates/part/detail.html:214 part/templates/part/detail.html:294
 #: part/templates/part/detail.html:317 templates/js/translated/company.js:424
-#: templates/js/translated/helpers.js:31 users/models.py:194
+#: templates/js/translated/helpers.js:31 users/models.py:199
 msgid "Delete"
 msgstr ""
 
@@ -2772,8 +2853,8 @@ msgstr ""
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:182
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109
 #: templates/js/translated/part.js:540 templates/js/translated/part.js:769
 #: templates/js/translated/part.js:945 templates/js/translated/stock.js:182
 #: templates/js/translated/stock.js:829 templates/navbar.html:32
@@ -3735,8 +3816,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
 #: templates/js/translated/part.js:1165 templates/navbar.html:29
 #: templates/stats.html:80 templates/stats.html:89 users/models.py:41
 msgid "Parts"
@@ -3950,7 +4031,7 @@ msgstr ""
 
 #: part/models.py:696 part/models.py:2299
 #: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:168
+#: templates/InvenTree/settings/settings.html:169
 #: templates/js/translated/part.js:927
 msgid "Category"
 msgstr ""
@@ -4140,7 +4221,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2256 part/models.py:2305 part/models.py:2306
-#: templates/InvenTree/settings/settings.html:163
+#: templates/InvenTree/settings/settings.html:164
 msgid "Parameter Template"
 msgstr "Parametre Şablonu"
 
@@ -4152,7 +4233,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2310 templates/InvenTree/settings/settings.html:172
+#: part/models.py:2310 templates/InvenTree/settings/settings.html:173
 msgid "Default Value"
 msgstr ""
 
@@ -6170,6 +6251,16 @@ msgstr ""
 msgid "Setting"
 msgstr ""
 
+#: templates/InvenTree/settings/login.html:9
+#, fuzzy
+#| msgid "Theme Settings"
+msgid "Login Settings"
+msgstr "Tema Ayarları"
+
+#: templates/InvenTree/settings/login.html:22 templates/account/signup.html:5
+msgid "Signup"
+msgstr ""
+
 #: templates/InvenTree/settings/navbar.html:12
 #: templates/InvenTree/settings/user_settings.html:9
 msgid "User Settings"
@@ -6223,22 +6314,27 @@ msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
-msgid "Barcodes"
+#: templates/InvenTree/settings/navbar.html:73 templates/navbar.html:87
+msgid "Login"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:77
 #: templates/InvenTree/settings/navbar.html:79
-msgid "Currencies"
+msgid "Barcodes"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:83
 #: templates/InvenTree/settings/navbar.html:85
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
 msgid "Reporting"
 msgstr ""
 
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103
 msgid "Categories"
 msgstr ""
 
@@ -6279,21 +6375,21 @@ msgstr ""
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:153
+#: templates/InvenTree/settings/settings.html:154
 msgid "No category parameter templates found"
 msgstr "Kategori parametre şablonu bulunamadı"
 
-#: templates/InvenTree/settings/settings.html:175
-#: templates/InvenTree/settings/settings.html:274
+#: templates/InvenTree/settings/settings.html:176
+#: templates/InvenTree/settings/settings.html:275
 msgid "Edit Template"
 msgstr "Şablonu Düzenle"
 
-#: templates/InvenTree/settings/settings.html:176
-#: templates/InvenTree/settings/settings.html:275
+#: templates/InvenTree/settings/settings.html:177
+#: templates/InvenTree/settings/settings.html:276
 msgid "Delete Template"
 msgstr "Şablonu Sil"
 
-#: templates/InvenTree/settings/settings.html:254
+#: templates/InvenTree/settings/settings.html:255
 msgid "No part parameter templates found"
 msgstr "Parça parametre şablonu bulunamadı"
 
@@ -6305,70 +6401,144 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:9
+#: templates/InvenTree/settings/user.html:11
 msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:15
+#: templates/InvenTree/settings/user.html:19
 #: templates/js/translated/helpers.js:26
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:17
+#: templates/InvenTree/settings/user.html:21
+#: templates/account/password_reset_from_key.html:4
+#: templates/account/password_reset_from_key.html:7
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:24
-#: templates/registration/login.html:58
+#: templates/InvenTree/settings/user.html:28
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:32
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:36
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
-msgid "Email Address"
+#: templates/InvenTree/settings/user.html:42
+msgid "E-Mail"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:47
+msgid "The following e-mail addresses are associated with your account:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:61
+msgid "Verified"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:63
+msgid "Unverified"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:65
+msgid "Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:71
+msgid "Make Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:72
+msgid "Re-send Verification"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:73
+#: templates/InvenTree/settings/user.html:130
+msgid "Remove"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:80
+#, fuzzy
+#| msgid "Warning"
+msgid "Warning:"
+msgstr "Uyarı"
+
+#: templates/InvenTree/settings/user.html:81
+msgid "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."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:88
+#, fuzzy
+#| msgid "Email Address"
+msgid "Add E-mail Address"
 msgstr "E-Posta Adresi"
 
-#: templates/InvenTree/settings/user.html:42
+#: templates/InvenTree/settings/user.html:93
+#, fuzzy
+#| msgid "Email"
+msgid "Add E-mail"
+msgstr "E-posta"
+
+#: templates/InvenTree/settings/user.html:100
+#, fuzzy
+#| msgid "Stock counted"
+msgid "Social Accounts"
+msgstr "Stok sayıldı"
+
+#: templates/InvenTree/settings/user.html:105
+msgid "You can sign in to your account using any of the following third party accounts:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:138
+msgid "You currently have no social network accounts connected to this account."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:142
+msgid "Add a 3rd Party Account"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:153
 msgid "Theme Settings"
 msgstr "Tema Ayarları"
 
-#: templates/InvenTree/settings/user.html:63
+#: templates/InvenTree/settings/user.html:174
 msgid "Set Theme"
 msgstr "Tema Seç"
 
-#: templates/InvenTree/settings/user.html:70
+#: templates/InvenTree/settings/user.html:181
 msgid "Language Settings"
 msgstr "Dil Ayarları"
 
-#: templates/InvenTree/settings/user.html:89
+#: templates/InvenTree/settings/user.html:200
 #, python-format
 msgid "%(lang_translated)s%% translated"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:91
+#: templates/InvenTree/settings/user.html:202
 msgid "No translations available"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:98
+#: templates/InvenTree/settings/user.html:209
 msgid "Set Language"
 msgstr "Dili Ayarla"
 
-#: templates/InvenTree/settings/user.html:103
+#: templates/InvenTree/settings/user.html:214
 msgid "Help the translation efforts!"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:104
+#: templates/InvenTree/settings/user.html:215
 #, python-format
 msgid "Native language translation of the InvenTree web application is <a href=\"%(link)s\">community contributed via crowdin</a>. Contributions are welcomed and encouraged."
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:223
+msgid "Do you really want to remove the selected e-mail address?"
+msgstr ""
+
 #: templates/InvenTree/settings/user_forms.html:9
 #, fuzzy
 #| msgid "Theme Settings"
@@ -6462,6 +6632,117 @@ msgstr "sürüm bilgisini kopyala"
 msgid "Close"
 msgstr "Kapat"
 
+#: templates/account/email_confirm.html:6
+#: templates/account/email_confirm.html:10
+#, fuzzy
+#| msgid "Email Address"
+msgid "Confirm E-mail Address"
+msgstr "E-Posta Adresi"
+
+#: templates/account/email_confirm.html:16
+#, python-format
+msgid "Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail address for user %(user_display)s."
+msgstr ""
+
+#: templates/account/email_confirm.html:27
+#, python-format
+msgid "This e-mail confirmation link expired or is invalid. Please <a href=\"%(email_url)s\">issue a new e-mail confirmation request</a>."
+msgstr ""
+
+#: templates/account/login.html:5 templates/account/login.html:14
+#: templates/account/login.html:36
+msgid "Sign In"
+msgstr ""
+
+#: templates/account/login.html:19
+#, python-format
+msgid ""
+"Please sign in with one\n"
+"of your existing third party accounts or  <a class=\"btn btn-primary btn-small\" href=\"%(signup_url)s\">sign up</a>\n"
+"for a account and sign in below:"
+msgstr ""
+
+#: templates/account/login.html:23
+#, python-format
+msgid ""
+"If you have not created an account yet, then please\n"
+"<a href=\"%(signup_url)s\">sign up</a> first."
+msgstr ""
+
+#: templates/account/login.html:38
+#, fuzzy
+#| msgid "Set Password"
+msgid "Forgot Password?"
+msgstr "Şifre Belirle"
+
+#: templates/account/login.html:45
+msgid "or use SSO"
+msgstr ""
+
+#: templates/account/logout.html:5 templates/account/logout.html:8
+#: templates/account/logout.html:17
+msgid "Sign Out"
+msgstr ""
+
+#: templates/account/logout.html:10
+#, fuzzy
+#| msgid "Are you sure you want to delete category"
+msgid "Are you sure you want to sign out?"
+msgstr "Bu kategoriyi silmek istediğinize emin misiniz"
+
+#: templates/account/password_reset.html:5
+#: templates/account/password_reset.html:12
+#, fuzzy
+#| msgid "Set Password"
+msgid "Password Reset"
+msgstr "Şifre Belirle"
+
+#: templates/account/password_reset.html:18
+msgid "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it."
+msgstr ""
+
+#: templates/account/password_reset.html:23
+#, fuzzy
+#| msgid "Set Password"
+msgid "Reset My Password"
+msgstr "Şifre Belirle"
+
+#: templates/account/password_reset.html:27 templates/account/signup.html:36
+msgid "This function is currently disabled. Please contact an administrator."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:7
+msgid "Bad Token"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:11
+#, python-format
+msgid "The password reset link was invalid, possibly because it has already been used.  Please request a <a href=\"%(passwd_reset_url)s\">new password reset</a>."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:17
+#, fuzzy
+#| msgid "Enter password"
+msgid "change password"
+msgstr "Şifrenizi girin"
+
+#: templates/account/password_reset_from_key.html:20
+msgid "Your password is now changed."
+msgstr ""
+
+#: templates/account/signup.html:11 templates/account/signup.html:22
+msgid "Sign Up"
+msgstr ""
+
+#: templates/account/signup.html:13
+#, python-format
+msgid "Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>."
+msgstr ""
+
+#: templates/account/signup.html:27
+msgid "Or use a SSO-provider for signup"
+msgstr ""
+
 #: templates/image_download.html:8
 msgid "Specify URL for downloading image"
 msgstr ""
@@ -7637,7 +7918,7 @@ msgstr ""
 msgid "Add Stock"
 msgstr ""
 
-#: templates/js/translated/stock.js:165 users/models.py:190
+#: templates/js/translated/stock.js:165 users/models.py:195
 msgid "Add"
 msgstr ""
 
@@ -8094,10 +8375,6 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: templates/navbar.html:87 templates/registration/login.html:89
-msgid "Login"
-msgstr ""
-
 #: templates/navbar.html:106
 msgid "About InvenTree"
 msgstr ""
@@ -8106,68 +8383,12 @@ msgstr ""
 msgid "QR data not provided"
 msgstr ""
 
-#: templates/registration/logged_out.html:50
-msgid "You have been logged out"
+#: templates/registration/logged_out.html:6
+msgid "You were logged out successfully."
 msgstr ""
 
-#: templates/registration/logged_out.html:51
-#: templates/registration/password_reset_complete.html:51
-#: templates/registration/password_reset_done.html:58
-msgid "Return to login screen"
-msgstr ""
-
-#: templates/registration/login.html:64
-msgid "Enter username"
-msgstr ""
-
-#: templates/registration/login.html:70
-msgid "Password"
-msgstr ""
-
-#: templates/registration/login.html:83
-msgid "Username / password combination is incorrect"
-msgstr ""
-
-#: templates/registration/login.html:95
-#: templates/registration/password_reset_form.html:51
-msgid "Forgotten your password?"
-msgstr ""
-
-#: templates/registration/login.html:95
-msgid "Click here to reset"
-msgstr ""
-
-#: templates/registration/password_reset_complete.html:50
-msgid "Password reset complete"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:52
-#: templates/registration/password_reset_confirm.html:56
-msgid "Change password"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:60
-msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:51
-msgid "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:54
-msgid "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:52
-msgid "Enter your email address below."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:53
-msgid "An email will be sent with password reset instructions."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:58
-msgid "Send email"
+#: templates/registration/logged_out.html:8
+msgid "Log in again"
 msgstr ""
 
 #: templates/stats.html:13
@@ -8306,35 +8527,35 @@ msgstr ""
 msgid "Important dates"
 msgstr ""
 
-#: users/models.py:177
+#: users/models.py:182
 msgid "Permission set"
 msgstr ""
 
-#: users/models.py:185
+#: users/models.py:190
 msgid "Group"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "View"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "Permission to view items"
 msgstr ""
 
-#: users/models.py:190
+#: users/models.py:195
 msgid "Permission to add items"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Change"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Permissions to edit items"
 msgstr ""
 
-#: users/models.py:194
+#: users/models.py:199
 msgid "Permission to delete items"
 msgstr ""
 
diff --git a/InvenTree/locale/vi/LC_MESSAGES/django.po b/InvenTree/locale/vi/LC_MESSAGES/django.po
index f85aa4c458..15bb950dab 100644
--- a/InvenTree/locale/vi/LC_MESSAGES/django.po
+++ b/InvenTree/locale/vi/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-11 01:01+0000\n"
+"POT-Creation-Date: 2021-10-11 06:21+0000\n"
 "PO-Revision-Date: 2021-09-12 13:44\n"
 "Last-Translator: \n"
 "Language-Team: Vietnamese\n"
@@ -33,41 +33,54 @@ msgstr ""
 msgid "Enter date"
 msgstr ""
 
-#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:116 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:173 build/forms.py:215 order/forms.py:27
 #: order/forms.py:38 order/forms.py:49 order/forms.py:60 order/forms.py:71
-#: part/forms.py:108 templates/js/translated/forms.js:564
+#: part/forms.py:108 templates/account/email_confirm.html:20
+#: templates/js/translated/forms.js:564
 msgid "Confirm"
 msgstr ""
 
-#: InvenTree/forms.py:127
+#: InvenTree/forms.py:132
 msgid "Confirm delete"
 msgstr ""
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:133
 msgid "Confirm item deletion"
 msgstr ""
 
-#: InvenTree/forms.py:160 templates/registration/login.html:76
+#: InvenTree/forms.py:164
 msgid "Enter password"
 msgstr ""
 
-#: InvenTree/forms.py:161
+#: InvenTree/forms.py:165
 msgid "Enter new password"
 msgstr ""
 
-#: InvenTree/forms.py:168
+#: InvenTree/forms.py:172
 msgid "Confirm password"
 msgstr ""
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:173
 msgid "Confirm new password"
 msgstr ""
 
-#: InvenTree/forms.py:201
+#: InvenTree/forms.py:205
 msgid "Select Category"
 msgstr ""
 
+#: InvenTree/forms.py:226
+msgid "E-mail (again)"
+msgstr ""
+
+#: InvenTree/forms.py:230
+msgid "E-mail address confirmation"
+msgstr ""
+
+#: InvenTree/forms.py:250
+msgid "You must type the same email each time."
+msgstr ""
+
 #: InvenTree/helpers.py:401
 #, python-brace-format
 msgid "Duplicate serial: {n}"
@@ -118,8 +131,8 @@ msgstr ""
 msgid "File comment"
 msgstr ""
 
-#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1011
-#: common/models.py:1012 part/models.py:2055
+#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1055
+#: common/models.py:1056 part/models.py:2055
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/translated/stock.js:1669
 msgid "User"
@@ -205,75 +218,75 @@ msgstr ""
 msgid "Filename"
 msgstr ""
 
-#: InvenTree/settings.py:523
+#: InvenTree/settings.py:529
 msgid "German"
 msgstr ""
 
-#: InvenTree/settings.py:524
+#: InvenTree/settings.py:530
 msgid "Greek"
 msgstr ""
 
-#: InvenTree/settings.py:525
+#: InvenTree/settings.py:531
 msgid "English"
 msgstr ""
 
-#: InvenTree/settings.py:526
+#: InvenTree/settings.py:532
 msgid "Spanish"
 msgstr ""
 
-#: InvenTree/settings.py:527
+#: InvenTree/settings.py:533
 msgid "French"
 msgstr ""
 
-#: InvenTree/settings.py:528
+#: InvenTree/settings.py:534
 msgid "Hebrew"
 msgstr ""
 
-#: InvenTree/settings.py:529
+#: InvenTree/settings.py:535
 msgid "Italian"
 msgstr ""
 
-#: InvenTree/settings.py:530
+#: InvenTree/settings.py:536
 msgid "Japanese"
 msgstr ""
 
-#: InvenTree/settings.py:531
+#: InvenTree/settings.py:537
 msgid "Korean"
 msgstr ""
 
-#: InvenTree/settings.py:532
+#: InvenTree/settings.py:538
 msgid "Dutch"
 msgstr ""
 
-#: InvenTree/settings.py:533
+#: InvenTree/settings.py:539
 msgid "Norwegian"
 msgstr ""
 
-#: InvenTree/settings.py:534
+#: InvenTree/settings.py:540
 msgid "Polish"
 msgstr ""
 
-#: InvenTree/settings.py:535
+#: InvenTree/settings.py:541
 msgid "Russian"
 msgstr ""
 
-#: InvenTree/settings.py:536
+#: InvenTree/settings.py:542
 msgid "Swedish"
 msgstr ""
 
-#: InvenTree/settings.py:537
+#: InvenTree/settings.py:543
 msgid "Thai"
 msgstr ""
 
-#: InvenTree/settings.py:538
+#: InvenTree/settings.py:544
 msgid "Turkish"
 msgstr ""
 
-#: InvenTree/settings.py:539
+#: InvenTree/settings.py:545
 msgid "Vietnamese"
 msgstr ""
 
-#: InvenTree/settings.py:540
+#: InvenTree/settings.py:546
 msgid "Chinese"
 msgstr ""
 
@@ -458,27 +471,27 @@ msgstr ""
 msgid "Overage must be an integer value or a percentage"
 msgstr ""
 
-#: InvenTree/views.py:610
+#: InvenTree/views.py:616
 msgid "Delete Item"
 msgstr ""
 
-#: InvenTree/views.py:659
+#: InvenTree/views.py:665
 msgid "Check box to confirm item deletion"
 msgstr ""
 
-#: InvenTree/views.py:674 templates/InvenTree/settings/user.html:14
+#: InvenTree/views.py:680 templates/InvenTree/settings/user.html:18
 msgid "Edit User Information"
 msgstr ""
 
-#: InvenTree/views.py:685 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:691 templates/InvenTree/settings/user.html:22
 msgid "Set Password"
 msgstr ""
 
-#: InvenTree/views.py:704
+#: InvenTree/views.py:710
 msgid "Password fields must match"
 msgstr ""
 
-#: InvenTree/views.py:910 templates/navbar.html:97
+#: InvenTree/views.py:954 templates/navbar.html:97
 msgid "System Information"
 msgstr ""
 
@@ -551,7 +564,7 @@ msgstr ""
 #: build/forms.py:48 build/forms.py:90 build/models.py:1281
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:1043
+#: build/templates/build/detail.html:34 common/models.py:1087
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:101 order/forms.py:123 order/models.py:720
 #: order/models.py:982 order/templates/order/order_wizard/match_parts.html:30
@@ -681,8 +694,8 @@ msgstr ""
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:50
 #: part/templates/part/navbar.html:53 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:171
-#: templates/InvenTree/settings/navbar.html:107
-#: templates/InvenTree/settings/navbar.html:109 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 users/models.py:44
 msgid "Build Orders"
 msgstr ""
 
@@ -1541,7 +1554,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:308 common/models.py:843 common/models.py:1004
+#: common/models.py:308 common/models.py:887 common/models.py:1048
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1955,196 +1968,252 @@ msgstr ""
 msgid "Enable PO functionality in InvenTree interface"
 msgstr ""
 
+#: common/models.py:836
+msgid "Enable password forgot"
+msgstr ""
+
+#: common/models.py:837
+msgid "Enable password forgot function on the login-pages"
+msgstr ""
+
+#: common/models.py:842
+msgid "Enable registration"
+msgstr ""
+
+#: common/models.py:843
+msgid "Enable self-registration for users on the login-pages"
+msgstr ""
+
+#: common/models.py:848
+msgid "Enable SSO"
+msgstr ""
+
+#: common/models.py:849
+msgid "Enable SSO on the login-pages"
+msgstr ""
+
 #: common/models.py:854
-msgid "Show starred parts"
+msgid "E-Mail required"
 msgstr ""
 
 #: common/models.py:855
-msgid "Show starred parts on the homepage"
+msgid "Require user to supply mail on signup"
 msgstr ""
 
 #: common/models.py:860
-msgid "Show latest parts"
+msgid "Auto-fill SSO users"
 msgstr ""
 
 #: common/models.py:861
-msgid "Show latest parts on the homepage"
+msgid "Automatically fill out user-details from SSO account-data"
 msgstr ""
 
 #: common/models.py:866
-msgid "Recent Part Count"
+msgid "Mail twice"
 msgstr ""
 
 #: common/models.py:867
-msgid "Number of recent parts to display on index page"
+msgid "On signup ask users twice for their mail"
+msgstr ""
+
+#: common/models.py:872
+msgid "Password twice"
 msgstr ""
 
 #: common/models.py:873
-msgid "Show unvalidated BOMs"
-msgstr ""
-
-#: common/models.py:874
-msgid "Show BOMs that await validation on the homepage"
-msgstr ""
-
-#: common/models.py:879
-msgid "Show recent stock changes"
-msgstr ""
-
-#: common/models.py:880
-msgid "Show recently changed stock items on the homepage"
-msgstr ""
-
-#: common/models.py:885
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:886
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:891
-msgid "Show low stock"
-msgstr ""
-
-#: common/models.py:892
-msgid "Show low stock items on the homepage"
-msgstr ""
-
-#: common/models.py:897
-msgid "Show depleted stock"
+msgid "On signup ask users twice for their password"
 msgstr ""
 
 #: common/models.py:898
-msgid "Show depleted stock items on the homepage"
+msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:903
-msgid "Show needed stock"
+#: common/models.py:899
+msgid "Show starred parts on the homepage"
 msgstr ""
 
 #: common/models.py:904
-msgid "Show stock items needed for builds on the homepage"
+msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:909
-msgid "Show expired stock"
+#: common/models.py:905
+msgid "Show latest parts on the homepage"
 msgstr ""
 
 #: common/models.py:910
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:911
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:917
+msgid "Show unvalidated BOMs"
+msgstr ""
+
+#: common/models.py:918
+msgid "Show BOMs that await validation on the homepage"
+msgstr ""
+
+#: common/models.py:923
+msgid "Show recent stock changes"
+msgstr ""
+
+#: common/models.py:924
+msgid "Show recently changed stock items on the homepage"
+msgstr ""
+
+#: common/models.py:929
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:930
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:935
+msgid "Show low stock"
+msgstr ""
+
+#: common/models.py:936
+msgid "Show low stock items on the homepage"
+msgstr ""
+
+#: common/models.py:941
+msgid "Show depleted stock"
+msgstr ""
+
+#: common/models.py:942
+msgid "Show depleted stock items on the homepage"
+msgstr ""
+
+#: common/models.py:947
+msgid "Show needed stock"
+msgstr ""
+
+#: common/models.py:948
+msgid "Show stock items needed for builds on the homepage"
+msgstr ""
+
+#: common/models.py:953
+msgid "Show expired stock"
+msgstr ""
+
+#: common/models.py:954
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:915
+#: common/models.py:959
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:916
+#: common/models.py:960
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:921
+#: common/models.py:965
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:922
+#: common/models.py:966
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:927
+#: common/models.py:971
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:928
+#: common/models.py:972
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:933
+#: common/models.py:977
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:934
+#: common/models.py:978
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:939
+#: common/models.py:983
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:940
+#: common/models.py:984
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:945
+#: common/models.py:989
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:946
+#: common/models.py:990
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:951
+#: common/models.py:995
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:952
+#: common/models.py:996
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:958
+#: common/models.py:1002
 msgid "Inline label display"
 msgstr ""
 
-#: common/models.py:959
+#: common/models.py:1003
 msgid "Display PDF labels in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:965
+#: common/models.py:1009
 msgid "Inline report display"
 msgstr ""
 
-#: common/models.py:966
+#: common/models.py:1010
 msgid "Display PDF reports in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:972
+#: common/models.py:1016
 msgid "Search Preview Results"
 msgstr ""
 
-#: common/models.py:973
+#: common/models.py:1017
 msgid "Number of results to show in search preview window"
 msgstr ""
 
-#: common/models.py:979
+#: common/models.py:1023
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:980
+#: common/models.py:1024
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:986
+#: common/models.py:1030
 msgid "Escape Key Closes Forms"
 msgstr ""
 
-#: common/models.py:987
+#: common/models.py:1031
 msgid "Use the escape key to close modal forms"
 msgstr ""
 
-#: common/models.py:1044 company/forms.py:43
+#: common/models.py:1088 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:1051 company/templates/company/supplier_part.html:231
+#: common/models.py:1095 company/templates/company/supplier_part.html:231
 #: templates/js/translated/part.js:1369
 msgid "Price"
 msgstr ""
 
-#: common/models.py:1052
+#: common/models.py:1096
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1145
+#: common/models.py:1189
 msgid "Default"
 msgstr ""
 
@@ -2593,8 +2662,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:82
 #: part/templates/part/navbar.html:85 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:229
-#: templates/InvenTree/settings/navbar.html:113
-#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:119
+#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:44
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2617,8 +2686,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:91
 #: part/templates/part/navbar.html:94 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:249
-#: templates/InvenTree/settings/navbar.html:119
-#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:55
+#: templates/InvenTree/settings/navbar.html:125
+#: templates/InvenTree/settings/navbar.html:127 templates/navbar.html:55
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2704,7 +2773,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part.html:239
 #: part/templates/part/detail.html:214 part/templates/part/detail.html:294
 #: part/templates/part/detail.html:317 templates/js/translated/company.js:424
-#: templates/js/translated/helpers.js:31 users/models.py:194
+#: templates/js/translated/helpers.js:31 users/models.py:199
 msgid "Delete"
 msgstr ""
 
@@ -2753,8 +2822,8 @@ msgstr ""
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:182
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109
 #: templates/js/translated/part.js:540 templates/js/translated/part.js:769
 #: templates/js/translated/part.js:945 templates/js/translated/stock.js:182
 #: templates/js/translated/stock.js:829 templates/navbar.html:32
@@ -3712,8 +3781,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
 #: templates/js/translated/part.js:1165 templates/navbar.html:29
 #: templates/stats.html:80 templates/stats.html:89 users/models.py:41
 msgid "Parts"
@@ -3927,7 +3996,7 @@ msgstr ""
 
 #: part/models.py:696 part/models.py:2299
 #: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:168
+#: templates/InvenTree/settings/settings.html:169
 #: templates/js/translated/part.js:927
 msgid "Category"
 msgstr ""
@@ -4117,7 +4186,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2256 part/models.py:2305 part/models.py:2306
-#: templates/InvenTree/settings/settings.html:163
+#: templates/InvenTree/settings/settings.html:164
 msgid "Parameter Template"
 msgstr ""
 
@@ -4129,7 +4198,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2310 templates/InvenTree/settings/settings.html:172
+#: part/models.py:2310 templates/InvenTree/settings/settings.html:173
 msgid "Default Value"
 msgstr ""
 
@@ -6143,6 +6212,14 @@ msgstr ""
 msgid "Setting"
 msgstr ""
 
+#: templates/InvenTree/settings/login.html:9
+msgid "Login Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/login.html:22 templates/account/signup.html:5
+msgid "Signup"
+msgstr ""
+
 #: templates/InvenTree/settings/navbar.html:12
 #: templates/InvenTree/settings/user_settings.html:9
 msgid "User Settings"
@@ -6196,22 +6273,27 @@ msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
-msgid "Barcodes"
+#: templates/InvenTree/settings/navbar.html:73 templates/navbar.html:87
+msgid "Login"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:77
 #: templates/InvenTree/settings/navbar.html:79
-msgid "Currencies"
+msgid "Barcodes"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:83
 #: templates/InvenTree/settings/navbar.html:85
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
 msgid "Reporting"
 msgstr ""
 
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103
 msgid "Categories"
 msgstr ""
 
@@ -6252,21 +6334,21 @@ msgstr ""
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:153
+#: templates/InvenTree/settings/settings.html:154
 msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:175
-#: templates/InvenTree/settings/settings.html:274
-msgid "Edit Template"
-msgstr ""
-
 #: templates/InvenTree/settings/settings.html:176
 #: templates/InvenTree/settings/settings.html:275
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/settings.html:177
+#: templates/InvenTree/settings/settings.html:276
 msgid "Delete Template"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:254
+#: templates/InvenTree/settings/settings.html:255
 msgid "No part parameter templates found"
 msgstr ""
 
@@ -6278,70 +6360,136 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:9
+#: templates/InvenTree/settings/user.html:11
 msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:15
+#: templates/InvenTree/settings/user.html:19
 #: templates/js/translated/helpers.js:26
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:17
+#: templates/InvenTree/settings/user.html:21
+#: templates/account/password_reset_from_key.html:4
+#: templates/account/password_reset_from_key.html:7
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:24
-#: templates/registration/login.html:58
+#: templates/InvenTree/settings/user.html:28
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:32
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:36
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
-msgid "Email Address"
+#: templates/InvenTree/settings/user.html:42
+msgid "E-Mail"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:42
-msgid "Theme Settings"
+#: templates/InvenTree/settings/user.html:47
+msgid "The following e-mail addresses are associated with your account:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:61
+msgid "Verified"
 msgstr ""
 
 #: templates/InvenTree/settings/user.html:63
+msgid "Unverified"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:65
+msgid "Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:71
+msgid "Make Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:72
+msgid "Re-send Verification"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:73
+#: templates/InvenTree/settings/user.html:130
+msgid "Remove"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:80
+msgid "Warning:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:81
+msgid "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."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:88
+msgid "Add E-mail Address"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:93
+msgid "Add E-mail"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:100
+msgid "Social Accounts"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:105
+msgid "You can sign in to your account using any of the following third party accounts:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:138
+msgid "You currently have no social network accounts connected to this account."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:142
+msgid "Add a 3rd Party Account"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:153
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:174
 msgid "Set Theme"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:70
+#: templates/InvenTree/settings/user.html:181
 msgid "Language Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:89
+#: templates/InvenTree/settings/user.html:200
 #, python-format
 msgid "%(lang_translated)s%% translated"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:91
+#: templates/InvenTree/settings/user.html:202
 msgid "No translations available"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:98
+#: templates/InvenTree/settings/user.html:209
 msgid "Set Language"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:103
+#: templates/InvenTree/settings/user.html:214
 msgid "Help the translation efforts!"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:104
+#: templates/InvenTree/settings/user.html:215
 #, python-format
 msgid "Native language translation of the InvenTree web application is <a href=\"%(link)s\">community contributed via crowdin</a>. Contributions are welcomed and encouraged."
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:223
+msgid "Do you really want to remove the selected e-mail address?"
+msgstr ""
+
 #: templates/InvenTree/settings/user_forms.html:9
 msgid "Form Settings"
 msgstr ""
@@ -6433,6 +6581,105 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#: templates/account/email_confirm.html:6
+#: templates/account/email_confirm.html:10
+msgid "Confirm E-mail Address"
+msgstr ""
+
+#: templates/account/email_confirm.html:16
+#, python-format
+msgid "Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail address for user %(user_display)s."
+msgstr ""
+
+#: templates/account/email_confirm.html:27
+#, python-format
+msgid "This e-mail confirmation link expired or is invalid. Please <a href=\"%(email_url)s\">issue a new e-mail confirmation request</a>."
+msgstr ""
+
+#: templates/account/login.html:5 templates/account/login.html:14
+#: templates/account/login.html:36
+msgid "Sign In"
+msgstr ""
+
+#: templates/account/login.html:19
+#, python-format
+msgid ""
+"Please sign in with one\n"
+"of your existing third party accounts or  <a class=\"btn btn-primary btn-small\" href=\"%(signup_url)s\">sign up</a>\n"
+"for a account and sign in below:"
+msgstr ""
+
+#: templates/account/login.html:23
+#, python-format
+msgid ""
+"If you have not created an account yet, then please\n"
+"<a href=\"%(signup_url)s\">sign up</a> first."
+msgstr ""
+
+#: templates/account/login.html:38
+msgid "Forgot Password?"
+msgstr ""
+
+#: templates/account/login.html:45
+msgid "or use SSO"
+msgstr ""
+
+#: templates/account/logout.html:5 templates/account/logout.html:8
+#: templates/account/logout.html:17
+msgid "Sign Out"
+msgstr ""
+
+#: templates/account/logout.html:10
+msgid "Are you sure you want to sign out?"
+msgstr ""
+
+#: templates/account/password_reset.html:5
+#: templates/account/password_reset.html:12
+msgid "Password Reset"
+msgstr ""
+
+#: templates/account/password_reset.html:18
+msgid "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it."
+msgstr ""
+
+#: templates/account/password_reset.html:23
+msgid "Reset My Password"
+msgstr ""
+
+#: templates/account/password_reset.html:27 templates/account/signup.html:36
+msgid "This function is currently disabled. Please contact an administrator."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:7
+msgid "Bad Token"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:11
+#, python-format
+msgid "The password reset link was invalid, possibly because it has already been used.  Please request a <a href=\"%(passwd_reset_url)s\">new password reset</a>."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:17
+msgid "change password"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:20
+msgid "Your password is now changed."
+msgstr ""
+
+#: templates/account/signup.html:11 templates/account/signup.html:22
+msgid "Sign Up"
+msgstr ""
+
+#: templates/account/signup.html:13
+#, python-format
+msgid "Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>."
+msgstr ""
+
+#: templates/account/signup.html:27
+msgid "Or use a SSO-provider for signup"
+msgstr ""
+
 #: templates/image_download.html:8
 msgid "Specify URL for downloading image"
 msgstr ""
@@ -7566,7 +7813,7 @@ msgstr ""
 msgid "Add Stock"
 msgstr ""
 
-#: templates/js/translated/stock.js:165 users/models.py:190
+#: templates/js/translated/stock.js:165 users/models.py:195
 msgid "Add"
 msgstr ""
 
@@ -8023,10 +8270,6 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: templates/navbar.html:87 templates/registration/login.html:89
-msgid "Login"
-msgstr ""
-
 #: templates/navbar.html:106
 msgid "About InvenTree"
 msgstr ""
@@ -8035,68 +8278,12 @@ msgstr ""
 msgid "QR data not provided"
 msgstr ""
 
-#: templates/registration/logged_out.html:50
-msgid "You have been logged out"
+#: templates/registration/logged_out.html:6
+msgid "You were logged out successfully."
 msgstr ""
 
-#: templates/registration/logged_out.html:51
-#: templates/registration/password_reset_complete.html:51
-#: templates/registration/password_reset_done.html:58
-msgid "Return to login screen"
-msgstr ""
-
-#: templates/registration/login.html:64
-msgid "Enter username"
-msgstr ""
-
-#: templates/registration/login.html:70
-msgid "Password"
-msgstr ""
-
-#: templates/registration/login.html:83
-msgid "Username / password combination is incorrect"
-msgstr ""
-
-#: templates/registration/login.html:95
-#: templates/registration/password_reset_form.html:51
-msgid "Forgotten your password?"
-msgstr ""
-
-#: templates/registration/login.html:95
-msgid "Click here to reset"
-msgstr ""
-
-#: templates/registration/password_reset_complete.html:50
-msgid "Password reset complete"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:52
-#: templates/registration/password_reset_confirm.html:56
-msgid "Change password"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:60
-msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:51
-msgid "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:54
-msgid "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:52
-msgid "Enter your email address below."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:53
-msgid "An email will be sent with password reset instructions."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:58
-msgid "Send email"
+#: templates/registration/logged_out.html:8
+msgid "Log in again"
 msgstr ""
 
 #: templates/stats.html:13
@@ -8235,34 +8422,34 @@ msgstr ""
 msgid "Important dates"
 msgstr ""
 
-#: users/models.py:177
+#: users/models.py:182
 msgid "Permission set"
 msgstr ""
 
-#: users/models.py:185
+#: users/models.py:190
 msgid "Group"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "View"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "Permission to view items"
 msgstr ""
 
-#: users/models.py:190
+#: users/models.py:195
 msgid "Permission to add items"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Change"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Permissions to edit items"
 msgstr ""
 
-#: users/models.py:194
+#: users/models.py:199
 msgid "Permission to delete items"
 msgstr ""
diff --git a/InvenTree/locale/zh/LC_MESSAGES/django.po b/InvenTree/locale/zh/LC_MESSAGES/django.po
index 62a85fba8d..3fdc9c9d5f 100644
--- a/InvenTree/locale/zh/LC_MESSAGES/django.po
+++ b/InvenTree/locale/zh/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-11 01:01+0000\n"
+"POT-Creation-Date: 2021-10-11 06:21+0000\n"
 "PO-Revision-Date: 2021-09-12 13:44\n"
 "Last-Translator: \n"
 "Language-Team: Chinese Simplified\n"
@@ -33,41 +33,54 @@ msgstr "未找到指定操作"
 msgid "Enter date"
 msgstr "输入日期"
 
-#: InvenTree/forms.py:111 build/forms.py:102 build/forms.py:123
+#: InvenTree/forms.py:116 build/forms.py:102 build/forms.py:123
 #: build/forms.py:145 build/forms.py:173 build/forms.py:215 order/forms.py:27
 #: order/forms.py:38 order/forms.py:49 order/forms.py:60 order/forms.py:71
-#: part/forms.py:108 templates/js/translated/forms.js:564
+#: part/forms.py:108 templates/account/email_confirm.html:20
+#: templates/js/translated/forms.js:564
 msgid "Confirm"
 msgstr "确认"
 
-#: InvenTree/forms.py:127
+#: InvenTree/forms.py:132
 msgid "Confirm delete"
 msgstr "确认删除"
 
-#: InvenTree/forms.py:128
+#: InvenTree/forms.py:133
 msgid "Confirm item deletion"
 msgstr "确认删除"
 
-#: InvenTree/forms.py:160 templates/registration/login.html:76
+#: InvenTree/forms.py:164
 msgid "Enter password"
 msgstr "输入密码"
 
-#: InvenTree/forms.py:161
+#: InvenTree/forms.py:165
 msgid "Enter new password"
 msgstr "输入新密码"
 
-#: InvenTree/forms.py:168
+#: InvenTree/forms.py:172
 msgid "Confirm password"
 msgstr "确认密码"
 
-#: InvenTree/forms.py:169
+#: InvenTree/forms.py:173
 msgid "Confirm new password"
 msgstr "确认新密码"
 
-#: InvenTree/forms.py:201
+#: InvenTree/forms.py:205
 msgid "Select Category"
 msgstr "选择分类"
 
+#: InvenTree/forms.py:226
+msgid "E-mail (again)"
+msgstr ""
+
+#: InvenTree/forms.py:230
+msgid "E-mail address confirmation"
+msgstr ""
+
+#: InvenTree/forms.py:250
+msgid "You must type the same email each time."
+msgstr ""
+
 #: InvenTree/helpers.py:401
 #, python-brace-format
 msgid "Duplicate serial: {n}"
@@ -118,8 +131,8 @@ msgstr "注释"
 msgid "File comment"
 msgstr "文件注释"
 
-#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1011
-#: common/models.py:1012 part/models.py:2055
+#: InvenTree/models.py:75 InvenTree/models.py:76 common/models.py:1055
+#: common/models.py:1056 part/models.py:2055
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/translated/stock.js:1669
 msgid "User"
@@ -205,75 +218,75 @@ msgstr "必须是有效数字"
 msgid "Filename"
 msgstr "文件名"
 
-#: InvenTree/settings.py:523
+#: InvenTree/settings.py:529
 msgid "German"
 msgstr "德语"
 
-#: InvenTree/settings.py:524
+#: InvenTree/settings.py:530
 msgid "Greek"
 msgstr "希腊语"
 
-#: InvenTree/settings.py:525
+#: InvenTree/settings.py:531
 msgid "English"
 msgstr "英语"
 
-#: InvenTree/settings.py:526
+#: InvenTree/settings.py:532
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: InvenTree/settings.py:527
+#: InvenTree/settings.py:533
 msgid "French"
 msgstr "法语"
 
-#: InvenTree/settings.py:528
+#: InvenTree/settings.py:534
 msgid "Hebrew"
 msgstr "希伯来语"
 
-#: InvenTree/settings.py:529
+#: InvenTree/settings.py:535
 msgid "Italian"
 msgstr "意大利语"
 
-#: InvenTree/settings.py:530
+#: InvenTree/settings.py:536
 msgid "Japanese"
 msgstr "日语"
 
-#: InvenTree/settings.py:531
+#: InvenTree/settings.py:537
 msgid "Korean"
 msgstr "韩语"
 
-#: InvenTree/settings.py:532
+#: InvenTree/settings.py:538
 msgid "Dutch"
 msgstr "荷兰语"
 
-#: InvenTree/settings.py:533
+#: InvenTree/settings.py:539
 msgid "Norwegian"
 msgstr "挪威语"
 
-#: InvenTree/settings.py:534
+#: InvenTree/settings.py:540
 msgid "Polish"
 msgstr "波兰语"
 
-#: InvenTree/settings.py:535
+#: InvenTree/settings.py:541
 msgid "Russian"
 msgstr "俄语"
 
-#: InvenTree/settings.py:536
+#: InvenTree/settings.py:542
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: InvenTree/settings.py:537
+#: InvenTree/settings.py:543
 msgid "Thai"
 msgstr "泰语"
 
-#: InvenTree/settings.py:538
+#: InvenTree/settings.py:544
 msgid "Turkish"
 msgstr "土耳其语"
 
-#: InvenTree/settings.py:539
+#: InvenTree/settings.py:545
 msgid "Vietnamese"
 msgstr "越南语"
 
-#: InvenTree/settings.py:540
+#: InvenTree/settings.py:546
 msgid "Chinese"
 msgstr "中文（简体）"
 
@@ -458,27 +471,27 @@ msgstr "备损不能超过 100%"
 msgid "Overage must be an integer value or a percentage"
 msgstr "备损必须是整数值或百分比"
 
-#: InvenTree/views.py:610
+#: InvenTree/views.py:616
 msgid "Delete Item"
 msgstr "删除项"
 
-#: InvenTree/views.py:659
+#: InvenTree/views.py:665
 msgid "Check box to confirm item deletion"
 msgstr "选中方框以确认项目删除"
 
-#: InvenTree/views.py:674 templates/InvenTree/settings/user.html:14
+#: InvenTree/views.py:680 templates/InvenTree/settings/user.html:18
 msgid "Edit User Information"
 msgstr "编辑用户信息"
 
-#: InvenTree/views.py:685 templates/InvenTree/settings/user.html:18
+#: InvenTree/views.py:691 templates/InvenTree/settings/user.html:22
 msgid "Set Password"
 msgstr "设置密码"
 
-#: InvenTree/views.py:704
+#: InvenTree/views.py:710
 msgid "Password fields must match"
 msgstr "密码字段必须相匹配。"
 
-#: InvenTree/views.py:910 templates/navbar.html:97
+#: InvenTree/views.py:954 templates/navbar.html:97
 msgid "System Information"
 msgstr "系统信息"
 
@@ -551,7 +564,7 @@ msgstr "生产完成的目标日期。生产将在此日期之后逾期。"
 #: build/forms.py:48 build/forms.py:90 build/models.py:1281
 #: build/templates/build/allocation_card.html:23
 #: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:1043
+#: build/templates/build/detail.html:34 common/models.py:1087
 #: company/forms.py:42 company/templates/company/supplier_part.html:226
 #: order/forms.py:101 order/forms.py:123 order/models.py:720
 #: order/models.py:982 order/templates/order/order_wizard/match_parts.html:30
@@ -681,8 +694,8 @@ msgstr "生产订单"
 #: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:50
 #: part/templates/part/navbar.html:53 templates/InvenTree/index.html:229
 #: templates/InvenTree/search.html:171
-#: templates/InvenTree/settings/navbar.html:107
-#: templates/InvenTree/settings/navbar.html:109 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 users/models.py:44
 msgid "Build Orders"
 msgstr "生产订单"
 
@@ -1551,7 +1564,7 @@ msgstr ""
 msgid "Select {name} file to upload"
 msgstr ""
 
-#: common/models.py:308 common/models.py:843 common/models.py:1004
+#: common/models.py:308 common/models.py:887 common/models.py:1048
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
 
@@ -1965,196 +1978,256 @@ msgstr ""
 msgid "Enable PO functionality in InvenTree interface"
 msgstr ""
 
+#: common/models.py:836
+#, fuzzy
+#| msgid "Enter password"
+msgid "Enable password forgot"
+msgstr "输入密码"
+
+#: common/models.py:837
+msgid "Enable password forgot function on the login-pages"
+msgstr ""
+
+#: common/models.py:842
+msgid "Enable registration"
+msgstr ""
+
+#: common/models.py:843
+msgid "Enable self-registration for users on the login-pages"
+msgstr ""
+
+#: common/models.py:848
+msgid "Enable SSO"
+msgstr ""
+
+#: common/models.py:849
+msgid "Enable SSO on the login-pages"
+msgstr ""
+
 #: common/models.py:854
-msgid "Show starred parts"
+msgid "E-Mail required"
 msgstr ""
 
 #: common/models.py:855
-msgid "Show starred parts on the homepage"
+msgid "Require user to supply mail on signup"
 msgstr ""
 
 #: common/models.py:860
-msgid "Show latest parts"
+msgid "Auto-fill SSO users"
 msgstr ""
 
 #: common/models.py:861
-msgid "Show latest parts on the homepage"
+msgid "Automatically fill out user-details from SSO account-data"
 msgstr ""
 
 #: common/models.py:866
-msgid "Recent Part Count"
+msgid "Mail twice"
 msgstr ""
 
 #: common/models.py:867
-msgid "Number of recent parts to display on index page"
+msgid "On signup ask users twice for their mail"
 msgstr ""
 
+#: common/models.py:872
+#, fuzzy
+#| msgid "Set Password"
+msgid "Password twice"
+msgstr "设置密码"
+
 #: common/models.py:873
-msgid "Show unvalidated BOMs"
-msgstr ""
-
-#: common/models.py:874
-msgid "Show BOMs that await validation on the homepage"
-msgstr ""
-
-#: common/models.py:879
-msgid "Show recent stock changes"
-msgstr ""
-
-#: common/models.py:880
-msgid "Show recently changed stock items on the homepage"
-msgstr ""
-
-#: common/models.py:885
-msgid "Recent Stock Count"
-msgstr ""
-
-#: common/models.py:886
-msgid "Number of recent stock items to display on index page"
-msgstr ""
-
-#: common/models.py:891
-msgid "Show low stock"
-msgstr ""
-
-#: common/models.py:892
-msgid "Show low stock items on the homepage"
-msgstr ""
-
-#: common/models.py:897
-msgid "Show depleted stock"
+msgid "On signup ask users twice for their password"
 msgstr ""
 
 #: common/models.py:898
-msgid "Show depleted stock items on the homepage"
+msgid "Show starred parts"
 msgstr ""
 
-#: common/models.py:903
-msgid "Show needed stock"
+#: common/models.py:899
+msgid "Show starred parts on the homepage"
 msgstr ""
 
 #: common/models.py:904
-msgid "Show stock items needed for builds on the homepage"
+msgid "Show latest parts"
 msgstr ""
 
-#: common/models.py:909
-msgid "Show expired stock"
+#: common/models.py:905
+msgid "Show latest parts on the homepage"
 msgstr ""
 
 #: common/models.py:910
+msgid "Recent Part Count"
+msgstr ""
+
+#: common/models.py:911
+msgid "Number of recent parts to display on index page"
+msgstr ""
+
+#: common/models.py:917
+msgid "Show unvalidated BOMs"
+msgstr ""
+
+#: common/models.py:918
+msgid "Show BOMs that await validation on the homepage"
+msgstr ""
+
+#: common/models.py:923
+msgid "Show recent stock changes"
+msgstr ""
+
+#: common/models.py:924
+msgid "Show recently changed stock items on the homepage"
+msgstr ""
+
+#: common/models.py:929
+msgid "Recent Stock Count"
+msgstr ""
+
+#: common/models.py:930
+msgid "Number of recent stock items to display on index page"
+msgstr ""
+
+#: common/models.py:935
+msgid "Show low stock"
+msgstr ""
+
+#: common/models.py:936
+msgid "Show low stock items on the homepage"
+msgstr ""
+
+#: common/models.py:941
+msgid "Show depleted stock"
+msgstr ""
+
+#: common/models.py:942
+msgid "Show depleted stock items on the homepage"
+msgstr ""
+
+#: common/models.py:947
+msgid "Show needed stock"
+msgstr ""
+
+#: common/models.py:948
+msgid "Show stock items needed for builds on the homepage"
+msgstr ""
+
+#: common/models.py:953
+msgid "Show expired stock"
+msgstr ""
+
+#: common/models.py:954
 msgid "Show expired stock items on the homepage"
 msgstr ""
 
-#: common/models.py:915
+#: common/models.py:959
 msgid "Show stale stock"
 msgstr ""
 
-#: common/models.py:916
+#: common/models.py:960
 msgid "Show stale stock items on the homepage"
 msgstr ""
 
-#: common/models.py:921
+#: common/models.py:965
 msgid "Show pending builds"
 msgstr ""
 
-#: common/models.py:922
+#: common/models.py:966
 msgid "Show pending builds on the homepage"
 msgstr ""
 
-#: common/models.py:927
+#: common/models.py:971
 msgid "Show overdue builds"
 msgstr ""
 
-#: common/models.py:928
+#: common/models.py:972
 msgid "Show overdue builds on the homepage"
 msgstr ""
 
-#: common/models.py:933
+#: common/models.py:977
 msgid "Show outstanding POs"
 msgstr ""
 
-#: common/models.py:934
+#: common/models.py:978
 msgid "Show outstanding POs on the homepage"
 msgstr ""
 
-#: common/models.py:939
+#: common/models.py:983
 msgid "Show overdue POs"
 msgstr ""
 
-#: common/models.py:940
+#: common/models.py:984
 msgid "Show overdue POs on the homepage"
 msgstr ""
 
-#: common/models.py:945
+#: common/models.py:989
 msgid "Show outstanding SOs"
 msgstr ""
 
-#: common/models.py:946
+#: common/models.py:990
 msgid "Show outstanding SOs on the homepage"
 msgstr ""
 
-#: common/models.py:951
+#: common/models.py:995
 msgid "Show overdue SOs"
 msgstr ""
 
-#: common/models.py:952
+#: common/models.py:996
 msgid "Show overdue SOs on the homepage"
 msgstr ""
 
-#: common/models.py:958
+#: common/models.py:1002
 msgid "Inline label display"
 msgstr ""
 
-#: common/models.py:959
+#: common/models.py:1003
 msgid "Display PDF labels in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:965
+#: common/models.py:1009
 msgid "Inline report display"
 msgstr ""
 
-#: common/models.py:966
+#: common/models.py:1010
 msgid "Display PDF reports in the browser, instead of downloading as a file"
 msgstr ""
 
-#: common/models.py:972
+#: common/models.py:1016
 msgid "Search Preview Results"
 msgstr ""
 
-#: common/models.py:973
+#: common/models.py:1017
 msgid "Number of results to show in search preview window"
 msgstr ""
 
-#: common/models.py:979
+#: common/models.py:1023
 msgid "Show Quantity in Forms"
 msgstr ""
 
-#: common/models.py:980
+#: common/models.py:1024
 msgid "Display available part quantity in some forms"
 msgstr ""
 
-#: common/models.py:986
+#: common/models.py:1030
 msgid "Escape Key Closes Forms"
 msgstr ""
 
-#: common/models.py:987
+#: common/models.py:1031
 msgid "Use the escape key to close modal forms"
 msgstr ""
 
-#: common/models.py:1044 company/forms.py:43
+#: common/models.py:1088 company/forms.py:43
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:1051 company/templates/company/supplier_part.html:231
+#: common/models.py:1095 company/templates/company/supplier_part.html:231
 #: templates/js/translated/part.js:1369
 msgid "Price"
 msgstr ""
 
-#: common/models.py:1052
+#: common/models.py:1096
 msgid "Unit price at specified quantity"
 msgstr ""
 
-#: common/models.py:1145
+#: common/models.py:1189
 msgid "Default"
 msgstr ""
 
@@ -2603,8 +2676,8 @@ msgstr ""
 #: part/templates/part/detail.html:50 part/templates/part/navbar.html:82
 #: part/templates/part/navbar.html:85 templates/InvenTree/index.html:260
 #: templates/InvenTree/search.html:229
-#: templates/InvenTree/settings/navbar.html:113
-#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:119
+#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:44
 #: users/models.py:45
 msgid "Purchase Orders"
 msgstr ""
@@ -2627,8 +2700,8 @@ msgstr ""
 #: part/templates/part/detail.html:71 part/templates/part/navbar.html:91
 #: part/templates/part/navbar.html:94 templates/InvenTree/index.html:291
 #: templates/InvenTree/search.html:249
-#: templates/InvenTree/settings/navbar.html:119
-#: templates/InvenTree/settings/navbar.html:121 templates/navbar.html:55
+#: templates/InvenTree/settings/navbar.html:125
+#: templates/InvenTree/settings/navbar.html:127 templates/navbar.html:55
 #: users/models.py:46
 msgid "Sales Orders"
 msgstr ""
@@ -2714,7 +2787,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part.html:239
 #: part/templates/part/detail.html:214 part/templates/part/detail.html:294
 #: part/templates/part/detail.html:317 templates/js/translated/company.js:424
-#: templates/js/translated/helpers.js:31 users/models.py:194
+#: templates/js/translated/helpers.js:31 users/models.py:199
 msgid "Delete"
 msgstr ""
 
@@ -2763,8 +2836,8 @@ msgstr ""
 #: stock/templates/stock/loc_link.html:7 stock/templates/stock/location.html:36
 #: stock/templates/stock/stock_app_base.html:10
 #: templates/InvenTree/index.html:150 templates/InvenTree/search.html:182
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109
 #: templates/js/translated/part.js:540 templates/js/translated/part.js:769
 #: templates/js/translated/part.js:945 templates/js/translated/stock.js:182
 #: templates/js/translated/stock.js:829 templates/navbar.html:32
@@ -3726,8 +3799,8 @@ msgstr ""
 #: part/templates/part/category_navbar.html:21
 #: part/templates/part/category_navbar.html:24
 #: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
 #: templates/js/translated/part.js:1165 templates/navbar.html:29
 #: templates/stats.html:80 templates/stats.html:89 users/models.py:41
 msgid "Parts"
@@ -3941,7 +4014,7 @@ msgstr ""
 
 #: part/models.py:696 part/models.py:2299
 #: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:168
+#: templates/InvenTree/settings/settings.html:169
 #: templates/js/translated/part.js:927
 msgid "Category"
 msgstr ""
@@ -4131,7 +4204,7 @@ msgid "Parameter Units"
 msgstr ""
 
 #: part/models.py:2256 part/models.py:2305 part/models.py:2306
-#: templates/InvenTree/settings/settings.html:163
+#: templates/InvenTree/settings/settings.html:164
 msgid "Parameter Template"
 msgstr ""
 
@@ -4143,7 +4216,7 @@ msgstr ""
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2310 templates/InvenTree/settings/settings.html:172
+#: part/models.py:2310 templates/InvenTree/settings/settings.html:173
 msgid "Default Value"
 msgstr ""
 
@@ -6161,6 +6234,14 @@ msgstr ""
 msgid "Setting"
 msgstr ""
 
+#: templates/InvenTree/settings/login.html:9
+msgid "Login Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/login.html:22 templates/account/signup.html:5
+msgid "Signup"
+msgstr ""
+
 #: templates/InvenTree/settings/navbar.html:12
 #: templates/InvenTree/settings/user_settings.html:9
 msgid "User Settings"
@@ -6214,22 +6295,27 @@ msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
-msgid "Barcodes"
+#: templates/InvenTree/settings/navbar.html:73 templates/navbar.html:87
+msgid "Login"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:77
 #: templates/InvenTree/settings/navbar.html:79
-msgid "Currencies"
+msgid "Barcodes"
 msgstr ""
 
 #: templates/InvenTree/settings/navbar.html:83
 #: templates/InvenTree/settings/navbar.html:85
+msgid "Currencies"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
 msgid "Reporting"
 msgstr ""
 
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103
 msgid "Categories"
 msgstr ""
 
@@ -6270,21 +6356,21 @@ msgstr ""
 msgid "Edit setting"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:153
+#: templates/InvenTree/settings/settings.html:154
 msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:175
-#: templates/InvenTree/settings/settings.html:274
-msgid "Edit Template"
-msgstr ""
-
 #: templates/InvenTree/settings/settings.html:176
 #: templates/InvenTree/settings/settings.html:275
+msgid "Edit Template"
+msgstr ""
+
+#: templates/InvenTree/settings/settings.html:177
+#: templates/InvenTree/settings/settings.html:276
 msgid "Delete Template"
 msgstr ""
 
-#: templates/InvenTree/settings/settings.html:254
+#: templates/InvenTree/settings/settings.html:255
 msgid "No part parameter templates found"
 msgstr ""
 
@@ -6296,70 +6382,138 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:9
+#: templates/InvenTree/settings/user.html:11
 msgid "Account Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:15
+#: templates/InvenTree/settings/user.html:19
 #: templates/js/translated/helpers.js:26
 msgid "Edit"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:17
+#: templates/InvenTree/settings/user.html:21
+#: templates/account/password_reset_from_key.html:4
+#: templates/account/password_reset_from_key.html:7
 msgid "Change Password"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:24
-#: templates/registration/login.html:58
+#: templates/InvenTree/settings/user.html:28
 msgid "Username"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:28
+#: templates/InvenTree/settings/user.html:32
 msgid "First Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:32
+#: templates/InvenTree/settings/user.html:36
 msgid "Last Name"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:36
-msgid "Email Address"
+#: templates/InvenTree/settings/user.html:42
+msgid "E-Mail"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:42
-msgid "Theme Settings"
+#: templates/InvenTree/settings/user.html:47
+msgid "The following e-mail addresses are associated with your account:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:61
+msgid "Verified"
 msgstr ""
 
 #: templates/InvenTree/settings/user.html:63
+msgid "Unverified"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:65
+msgid "Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:71
+msgid "Make Primary"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:72
+msgid "Re-send Verification"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:73
+#: templates/InvenTree/settings/user.html:130
+msgid "Remove"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:80
+msgid "Warning:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:81
+msgid "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."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:88
+msgid "Add E-mail Address"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:93
+msgid "Add E-mail"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:100
+#, fuzzy
+#| msgid "Stock counted"
+msgid "Social Accounts"
+msgstr "库存计数"
+
+#: templates/InvenTree/settings/user.html:105
+msgid "You can sign in to your account using any of the following third party accounts:"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:138
+msgid "You currently have no social network accounts connected to this account."
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:142
+msgid "Add a 3rd Party Account"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:153
+msgid "Theme Settings"
+msgstr ""
+
+#: templates/InvenTree/settings/user.html:174
 msgid "Set Theme"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:70
+#: templates/InvenTree/settings/user.html:181
 msgid "Language Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:89
+#: templates/InvenTree/settings/user.html:200
 #, python-format
 msgid "%(lang_translated)s%% translated"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:91
+#: templates/InvenTree/settings/user.html:202
 msgid "No translations available"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:98
+#: templates/InvenTree/settings/user.html:209
 msgid "Set Language"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:103
+#: templates/InvenTree/settings/user.html:214
 msgid "Help the translation efforts!"
 msgstr ""
 
-#: templates/InvenTree/settings/user.html:104
+#: templates/InvenTree/settings/user.html:215
 #, python-format
 msgid "Native language translation of the InvenTree web application is <a href=\"%(link)s\">community contributed via crowdin</a>. Contributions are welcomed and encouraged."
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:223
+msgid "Do you really want to remove the selected e-mail address?"
+msgstr ""
+
 #: templates/InvenTree/settings/user_forms.html:9
 msgid "Form Settings"
 msgstr ""
@@ -6451,6 +6605,113 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#: templates/account/email_confirm.html:6
+#: templates/account/email_confirm.html:10
+msgid "Confirm E-mail Address"
+msgstr ""
+
+#: templates/account/email_confirm.html:16
+#, python-format
+msgid "Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail address for user %(user_display)s."
+msgstr ""
+
+#: templates/account/email_confirm.html:27
+#, python-format
+msgid "This e-mail confirmation link expired or is invalid. Please <a href=\"%(email_url)s\">issue a new e-mail confirmation request</a>."
+msgstr ""
+
+#: templates/account/login.html:5 templates/account/login.html:14
+#: templates/account/login.html:36
+msgid "Sign In"
+msgstr ""
+
+#: templates/account/login.html:19
+#, python-format
+msgid ""
+"Please sign in with one\n"
+"of your existing third party accounts or  <a class=\"btn btn-primary btn-small\" href=\"%(signup_url)s\">sign up</a>\n"
+"for a account and sign in below:"
+msgstr ""
+
+#: templates/account/login.html:23
+#, python-format
+msgid ""
+"If you have not created an account yet, then please\n"
+"<a href=\"%(signup_url)s\">sign up</a> first."
+msgstr ""
+
+#: templates/account/login.html:38
+#, fuzzy
+#| msgid "Set Password"
+msgid "Forgot Password?"
+msgstr "设置密码"
+
+#: templates/account/login.html:45
+msgid "or use SSO"
+msgstr ""
+
+#: templates/account/logout.html:5 templates/account/logout.html:8
+#: templates/account/logout.html:17
+msgid "Sign Out"
+msgstr ""
+
+#: templates/account/logout.html:10
+msgid "Are you sure you want to sign out?"
+msgstr ""
+
+#: templates/account/password_reset.html:5
+#: templates/account/password_reset.html:12
+#, fuzzy
+#| msgid "Set Password"
+msgid "Password Reset"
+msgstr "设置密码"
+
+#: templates/account/password_reset.html:18
+msgid "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it."
+msgstr ""
+
+#: templates/account/password_reset.html:23
+#, fuzzy
+#| msgid "Set Password"
+msgid "Reset My Password"
+msgstr "设置密码"
+
+#: templates/account/password_reset.html:27 templates/account/signup.html:36
+msgid "This function is currently disabled. Please contact an administrator."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:7
+msgid "Bad Token"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:11
+#, python-format
+msgid "The password reset link was invalid, possibly because it has already been used.  Please request a <a href=\"%(passwd_reset_url)s\">new password reset</a>."
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:17
+#, fuzzy
+#| msgid "Enter password"
+msgid "change password"
+msgstr "输入密码"
+
+#: templates/account/password_reset_from_key.html:20
+msgid "Your password is now changed."
+msgstr ""
+
+#: templates/account/signup.html:11 templates/account/signup.html:22
+msgid "Sign Up"
+msgstr ""
+
+#: templates/account/signup.html:13
+#, python-format
+msgid "Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>."
+msgstr ""
+
+#: templates/account/signup.html:27
+msgid "Or use a SSO-provider for signup"
+msgstr ""
+
 #: templates/image_download.html:8
 msgid "Specify URL for downloading image"
 msgstr ""
@@ -7620,7 +7881,7 @@ msgstr ""
 msgid "Add Stock"
 msgstr ""
 
-#: templates/js/translated/stock.js:165 users/models.py:190
+#: templates/js/translated/stock.js:165 users/models.py:195
 msgid "Add"
 msgstr ""
 
@@ -8077,10 +8338,6 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: templates/navbar.html:87 templates/registration/login.html:89
-msgid "Login"
-msgstr ""
-
 #: templates/navbar.html:106
 msgid "About InvenTree"
 msgstr ""
@@ -8089,68 +8346,12 @@ msgstr ""
 msgid "QR data not provided"
 msgstr ""
 
-#: templates/registration/logged_out.html:50
-msgid "You have been logged out"
+#: templates/registration/logged_out.html:6
+msgid "You were logged out successfully."
 msgstr ""
 
-#: templates/registration/logged_out.html:51
-#: templates/registration/password_reset_complete.html:51
-#: templates/registration/password_reset_done.html:58
-msgid "Return to login screen"
-msgstr ""
-
-#: templates/registration/login.html:64
-msgid "Enter username"
-msgstr ""
-
-#: templates/registration/login.html:70
-msgid "Password"
-msgstr ""
-
-#: templates/registration/login.html:83
-msgid "Username / password combination is incorrect"
-msgstr ""
-
-#: templates/registration/login.html:95
-#: templates/registration/password_reset_form.html:51
-msgid "Forgotten your password?"
-msgstr ""
-
-#: templates/registration/login.html:95
-msgid "Click here to reset"
-msgstr ""
-
-#: templates/registration/password_reset_complete.html:50
-msgid "Password reset complete"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:52
-#: templates/registration/password_reset_confirm.html:56
-msgid "Change password"
-msgstr ""
-
-#: templates/registration/password_reset_confirm.html:60
-msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:51
-msgid "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly."
-msgstr ""
-
-#: templates/registration/password_reset_done.html:54
-msgid "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:52
-msgid "Enter your email address below."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:53
-msgid "An email will be sent with password reset instructions."
-msgstr ""
-
-#: templates/registration/password_reset_form.html:58
-msgid "Send email"
+#: templates/registration/logged_out.html:8
+msgid "Log in again"
 msgstr ""
 
 #: templates/stats.html:13
@@ -8289,34 +8490,34 @@ msgstr ""
 msgid "Important dates"
 msgstr ""
 
-#: users/models.py:177
+#: users/models.py:182
 msgid "Permission set"
 msgstr ""
 
-#: users/models.py:185
+#: users/models.py:190
 msgid "Group"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "View"
 msgstr ""
 
-#: users/models.py:188
+#: users/models.py:193
 msgid "Permission to view items"
 msgstr ""
 
-#: users/models.py:190
+#: users/models.py:195
 msgid "Permission to add items"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Change"
 msgstr ""
 
-#: users/models.py:192
+#: users/models.py:197
 msgid "Permissions to edit items"
 msgstr ""
 
-#: users/models.py:194
+#: users/models.py:199
 msgid "Permission to delete items"
 msgstr ""