diff --git a/src/controllers/dashboardgeneral.js b/src/controllers/dashboardgeneral.js
index 09aa1ec08e..c37e5e9a46 100644
--- a/src/controllers/dashboardgeneral.js
+++ b/src/controllers/dashboardgeneral.js
@@ -3,10 +3,11 @@ define(["jQuery", "loading", "fnchecked", "emby-checkbox", "emby-textarea", "emb
 
     function loadPage(page, config, languageOptions, systemInfo) {
         page.querySelector("#txtServerName").value = systemInfo.ServerName;
+        $("#chkAutoRunWebApp", page).checked(config.AutoRunWebApp);
         if (systemInfo.CanLaunchWebBrowser) {
-            page.querySelector("#fldRunWebAppAtStartup").classList.remove("hide");
+            page.querySelector("#fldAutoRunWebApp").classList.remove("hide");
         } else {
-            page.querySelector("#fldRunWebAppAtStartup").classList.add("hide");
+            page.querySelector("#fldAutoRunWebApp").classList.add("hide");
         }
         page.querySelector("#txtCachePath").value = systemInfo.CachePath || "";
         $("#txtMetadataPath", page).val(systemInfo.InternalMetadataPath || "");
@@ -46,6 +47,7 @@ define(["jQuery", "loading", "fnchecked", "emby-checkbox", "emby-textarea", "emb
             config.MetadataPath = $("#txtMetadataPath", form).val();
             config.MetadataNetworkPath = $("#txtMetadataNetworkPath", form).val();
             var requiresReload = (config.UICulture !== currentLanguage);
+            config.AutoRunWebApp = $("#chkAutoRunWebApp", form).checked();
             config.EnableAutomaticRestart = $("#chkEnableAutomaticRestart", form).checked();
             config.EnableAutoUpdate = $("#chkEnableAutomaticServerUpdates", form).checked();
             ApiClient.updateServerConfiguration(config).then(function() {
diff --git a/src/dashboardgeneral.html b/src/dashboardgeneral.html
index a285b0e55f..af46f34903 100644
--- a/src/dashboardgeneral.html
+++ b/src/dashboardgeneral.html
@@ -26,9 +26,9 @@
                             </div>
                         </div>
                     </div>
-                    <div id="fldRunWebAppAtStartup" class="checkboxContainer checkboxContainer-withDescription hide">
+                    <div id="fldAutoRunWebApp" class="checkboxContainer checkboxContainer-withDescription hide">
                         <label>
-                            <input is="emby-checkbox" type="checkbox" id="chkRunWebAppAtStartup" />
+                            <input is="emby-checkbox" type="checkbox" id="chkAutoRunWebApp" />
                             <span>${LaunchWebAppOnStartup}</span>
                         </label>
                         <div class="fieldDescription checkboxFieldDescription">