diff --git a/src/scripts/wizarduserpage.js b/src/scripts/wizarduserpage.js
index 9ada1b724f..dac1abf913 100644
--- a/src/scripts/wizarduserpage.js
+++ b/src/scripts/wizarduserpage.js
@@ -26,7 +26,9 @@ 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 +38,12 @@ define(["loading", "globalize", "dashboardcss", "emby-input", "emby-button", "em
     }
 
     function onSubmit(e) {
-        return submit(this), e.preventDefault(), !1
+        
+        var form = this;
+        return form.querySelector("#txtManualPassword").value != form.querySelector("#txtPasswordConfirm").value ? require(["toast"], function(toast) {
+            toast(Globalize.translate("PasswordMatchError"))
+        }) : submit(this), e.preventDefault(), !1
+
     }
 
     function onViewShow() {
@@ -45,6 +52,7 @@ define(["loading", "globalize", "dashboardcss", "emby-input", "emby-button", "em
             apiClient = getApiClient();
         apiClient.getJSON(apiClient.getUrl("Startup/User")).then(function(user) {
             page.querySelector("#txtUsername").value = user.Name || "", loading.hide()
+            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..e710f1e811 100644
--- a/src/strings/en-GB.json
+++ b/src/strings/en-GB.json
@@ -82,6 +82,7 @@
   "LabelUrl": "URL:",
   "LabelZipCode": "Post Code:",
   "LabelffmpegPathHelp": "The path to the ffmpeg application file or folder containing ffmpeg.",
+  "LeaveBlankToNotSetAPassword": "This field can be left blank.",
   "LinkApi": "API",
   "MessageConfirmRevokeApiKey": "Are you sure you wish to revoke this API key? The application's connection to Jellyfin Server will be abruptly terminated.",
   "MessageForgotPasswordFileExpiration": "The reset PIN will expire at {0}.",
diff --git a/src/strings/en-US.json b/src/strings/en-US.json
index c4c13fa256..43b3098d35 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": "This field can be left blank.",
   "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">