diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 4cadf33ac4..6ae333bdee 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -18,6 +18,7 @@
  - [ViXXoR](https://github.com/ViXXoR)
  - [nkmerrill] (https://github.com/nkmerrill)
  - [TtheCreator] (https://github.com/Tthecreator)
+ - [RazeLighter777](https://github.com/RazeLighter777)
 
 # Emby Contributors
 
diff --git a/src/scripts/wizarduserpage.js b/src/scripts/wizarduserpage.js
index 9ada1b724f..039962eda3 100644
--- a/src/scripts/wizarduserpage.js
+++ b/src/scripts/wizarduserpage.js
@@ -26,7 +26,8 @@ define(["loading", "globalize", "dashboardcss", "emby-input", "emby-button", "em
         apiClient.ajax({
             type: "POST",
             data: {
-                Name: form.querySelector("#txtUsername").value
+                Name: form.querySelector("#txtUsername").value,
+                Password: form.querySelector("#txtManualPassword").value 
             },
             url: apiClient.getUrl("Startup/User"),
             dataType: "json"
@@ -36,7 +37,16 @@ define(["loading", "globalize", "dashboardcss", "emby-input", "emby-button", "em
     }
 
     function onSubmit(e) {
-        return submit(this), e.preventDefault(), !1
+        var form = this;
+        if (form.querySelector("#txtManualPassword").value != form.querySelector("#txtPasswordConfirm").value) {
+            require(["toast"], function(toast) {
+                toast(Globalize.translate("PasswordMatchError"));
+            });
+        } else {
+            submit(form);
+        }
+        e.preventDefault();
+        return false;
     }
 
     function onViewShow() {
@@ -44,7 +54,9 @@ define(["loading", "globalize", "dashboardcss", "emby-input", "emby-button", "em
         var page = this,
             apiClient = getApiClient();
         apiClient.getJSON(apiClient.getUrl("Startup/User")).then(function(user) {
-            page.querySelector("#txtUsername").value = user.Name || "", loading.hide()
+            page.querySelector("#txtUsername").value = user.Name || "";
+            page.querySelector("#txtManualPassword").value = user.Password || "";
+            loading.hide();
         })
     }
     return function(view, params) {
diff --git a/src/strings/en-GB.json b/src/strings/en-GB.json
index ac8a0354d6..6e92b7757f 100644
--- a/src/strings/en-GB.json
+++ b/src/strings/en-GB.json
@@ -122,5 +122,5 @@
   "XmlTvMovieCategoriesHelp": "Programmes with these categories will be displayed as movies. Separate multiple with '|'.",
   "XmlTvNewsCategoriesHelp": "Programmes with these categories will be displayed as news programmes. Separate multiple with '|'.",
   "XmlTvPathHelp": "A path to an XML TV file. Jellyfin will read this file and periodically check it for updates. You are responsible for creating and updating the file.",
-  "XmlTvSportsCategoriesHelp": "Programmes with these categories will be displayed as sports programmes. Separate multiple with '|'.",
+  "XmlTvSportsCategoriesHelp": "Programmes with these categories will be displayed as sports programmes. Separate multiple with '|'."
 }
diff --git a/src/strings/en-US.json b/src/strings/en-US.json
index c4c13fa256..049f0c68e9 100644
--- a/src/strings/en-US.json
+++ b/src/strings/en-US.json
@@ -1028,6 +1028,7 @@
   "LanNetworksHelp": "Comma separated list of IP addresses or IP/netmask entries for networks that will be considered on local network when enforcing bandwidth restrictions. If set, all other IP addresses will be considered to be on the external network and will be subject to the external bandwidth restrictions. If left blank, only the server's subnet is considered to be on the local network.",
   "LatestFromLibrary": "Latest {0}",
   "LearnHowToCreateSynologyShares": "Learn how to share folders in Synology.",
+  "LeaveBlankToNotSetAPassword": "Optional - leave blank to set no password",
   "LetterButtonAbbreviation": "A",
   "LibraryAccessHelp": "Select the media folders to share with this user. Administrators will be able to edit all folders using the metadata manager.",
   "LinkApi": "Api",
diff --git a/src/wizardstart.html b/src/wizardstart.html
index a144b8cd12..723afa2aef 100644
--- a/src/wizardstart.html
+++ b/src/wizardstart.html
@@ -29,4 +29,4 @@
         </div>
 
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/wizarduser.html b/src/wizarduser.html
index 0df4d3bc07..26064d32fb 100644
--- a/src/wizarduser.html
+++ b/src/wizarduser.html
@@ -16,6 +16,13 @@
                         <input is="emby-input" type="text" id="txtUsername" label="${LabelYourFirstName}" required="required" />
                         <div class="fieldDescription">${MoreUsersCanBeAddedLater}</div>
                     </div>
+                    <div class="inputContainer">
+                        <input is="emby-input" id="txtManualPassword" type="password" label="${LabelPassword}" />
+                        <div class="fieldDescription">${LeaveBlankToNotSetAPassword}</div>
+                    </div>
+                    <div class="inputContainer">
+                        <input is="emby-input" id="txtPasswordConfirm" type="password" label="${LabelPasswordConfirm}" />
+                    </div>
                 </div>
 
                 <div class="wizardNavigation">