diff --git a/src/controllers/dashboard/general.js b/src/controllers/dashboard/general.js
index c37e5e9a46..742cae112f 100644
--- a/src/controllers/dashboard/general.js
+++ b/src/controllers/dashboard/general.js
@@ -1,38 +1,45 @@
-define(["jQuery", "loading", "fnchecked", "emby-checkbox", "emby-textarea", "emby-input", "emby-select", "emby-button"], function($, loading) {
+define(["jQuery", "loading", "fnchecked", "emby-checkbox", "emby-textarea", "emby-input", "emby-select", "emby-button"], function ($, loading) {
     "use strict";
 
     function loadPage(page, config, languageOptions, systemInfo) {
         page.querySelector("#txtServerName").value = systemInfo.ServerName;
         $("#chkAutoRunWebApp", page).checked(config.AutoRunWebApp);
+
         if (systemInfo.CanLaunchWebBrowser) {
             page.querySelector("#fldAutoRunWebApp").classList.remove("hide");
         } else {
             page.querySelector("#fldAutoRunWebApp").classList.add("hide");
         }
+
         page.querySelector("#txtCachePath").value = systemInfo.CachePath || "";
         $("#txtMetadataPath", page).val(systemInfo.InternalMetadataPath || "");
         $("#txtMetadataNetworkPath", page).val(systemInfo.MetadataNetworkPath || "");
-        $("#selectLocalizationLanguage", page).html(languageOptions.map(function(language) {
-            return '<option value="' + language.Value + '">' + language.Name + "</option>"
+        $("#selectLocalizationLanguage", page).html(languageOptions.map(function (language) {
+            return '<option value="' + language.Value + '">' + language.Name + "</option>";
         })).val(config.UICulture);
         currentLanguage = config.UICulture;
+
         if (systemInfo.CanSelfUpdate) {
             page.querySelector(".fldAutomaticUpdates").classList.remove("hide");
         } else {
             page.querySelector(".fldAutomaticUpdates").classList.add("hide");
         }
+
         $("#chkEnableAutomaticServerUpdates", page).checked(config.EnableAutoUpdate);
         $("#chkEnableAutomaticRestart", page).checked(config.EnableAutomaticRestart);
+
         if (systemInfo.CanSelfRestart) {
             page.querySelector("#fldEnableAutomaticRestart").classList.remove("hide");
         } else {
             page.querySelector("#fldEnableAutomaticRestart").classList.add("hide");
         }
+
         if (systemInfo.CanSelfRestart || systemInfo.CanSelfUpdate) {
             $(".autoUpdatesContainer", page).removeClass("hide");
         } else {
             $(".autoUpdatesContainer", page).addClass("hide");
         }
+
         loading.hide();
     }
 
@@ -40,92 +47,96 @@ define(["jQuery", "loading", "fnchecked", "emby-checkbox", "emby-textarea", "emb
         loading.show();
         var form = this;
         $(form).parents(".page");
-        return ApiClient.getServerConfiguration().then(function(config) {
+        ApiClient.getServerConfiguration().then(function (config) {
             config.ServerName = $("#txtServerName", form).val();
             config.UICulture = $("#selectLocalizationLanguage", form).val();
             config.CachePath = form.querySelector("#txtCachePath").value;
             config.MetadataPath = $("#txtMetadataPath", form).val();
             config.MetadataNetworkPath = $("#txtMetadataNetworkPath", form).val();
-            var requiresReload = (config.UICulture !== currentLanguage);
+            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() {
-                ApiClient.getNamedConfiguration(brandingConfigKey).then(function(brandingConfig) {
+            ApiClient.updateServerConfiguration(config).then(function () {
+                ApiClient.getNamedConfiguration(brandingConfigKey).then(function (brandingConfig) {
                     brandingConfig.LoginDisclaimer = form.querySelector("#txtLoginDisclaimer").value;
                     brandingConfig.CustomCss = form.querySelector("#txtCustomCss").value;
+
                     if (currentBrandingOptions && brandingConfig.CustomCss !== currentBrandingOptions.CustomCss) {
                         requiresReload = true;
                     }
-                    ApiClient.updateNamedConfiguration(brandingConfigKey, brandingConfig).then(function() {
+
+                    ApiClient.updateNamedConfiguration(brandingConfigKey, brandingConfig).then(function () {
                         Dashboard.processServerConfigurationUpdateResult();
+
                         if (requiresReload && !AppInfo.isNativeApp) {
                             window.location.reload(true);
                         }
                     });
-                })
-            })
-        }), !1
+                });
+            });
+        });
+        return false;
     }
 
     var currentBrandingOptions;
     var currentLanguage;
     var brandingConfigKey = "branding";
-
-    return function(view, params) {
-        $("#btnSelectCachePath", view).on("click.selectDirectory", function() {
-            require(["directorybrowser"], function(directoryBrowser) {
-                var picker = new directoryBrowser;
+    return function (view, params) {
+        $("#btnSelectCachePath", view).on("click.selectDirectory", function () {
+            require(["directorybrowser"], function (directoryBrowser) {
+                var picker = new directoryBrowser();
                 picker.show({
-                    callback: function(path) {
+                    callback: function (path) {
                         if (path) {
                             view.querySelector("#txtCachePath").value = path;
                         }
+
                         picker.close();
                     },
                     validateWriteable: true,
                     header: Globalize.translate("HeaderSelectServerCachePath"),
                     instruction: Globalize.translate("HeaderSelectServerCachePathHelp")
-                })
-            })
+                });
+            });
         });
-
-        $("#btnSelectMetadataPath", view).on("click.selectDirectory", function() {
-            require(["directorybrowser"], function(directoryBrowser) {
+        $("#btnSelectMetadataPath", view).on("click.selectDirectory", function () {
+            require(["directorybrowser"], function (directoryBrowser) {
                 var picker = new directoryBrowser();
                 picker.show({
                     path: $("#txtMetadataPath", view).val(),
                     networkSharePath: $("#txtMetadataNetworkPath", view).val(),
-                    callback: function(path, networkPath) {
+                    callback: function (path, networkPath) {
                         if (path) {
                             $("#txtMetadataPath", view).val(path);
                         }
+
                         if (networkPath) {
                             $("#txtMetadataNetworkPath", view).val(networkPath);
                         }
+
                         picker.close();
                     },
                     validateWriteable: true,
                     header: Globalize.translate("HeaderSelectMetadataPath"),
                     instruction: Globalize.translate("HeaderSelectMetadataPathHelp"),
                     enableNetworkSharePath: true
-                })
-            })
+                });
+            });
         });
-
         $(".dashboardGeneralForm", view).off("submit", onSubmit).on("submit", onSubmit);
-        view.addEventListener("viewshow", function() {
+        view.addEventListener("viewshow", function () {
             var promiseConfig = ApiClient.getServerConfiguration();
             var promiseLanguageOptions = ApiClient.getJSON(ApiClient.getUrl("Localization/Options"));
             var promiseSystemInfo = ApiClient.getSystemInfo();
-            Promise.all([promiseConfig, promiseLanguageOptions, promiseSystemInfo]).then(function(responses) {
+            Promise.all([promiseConfig, promiseLanguageOptions, promiseSystemInfo]).then(function (responses) {
                 loadPage(view, responses[0], responses[1], responses[2]);
             });
-            ApiClient.getNamedConfiguration(brandingConfigKey).then(function(config) {
+            ApiClient.getNamedConfiguration(brandingConfigKey).then(function (config) {
                 currentBrandingOptions = config;
                 view.querySelector("#txtLoginDisclaimer").value = config.LoginDisclaimer || "";
                 view.querySelector("#txtCustomCss").value = config.CustomCss || "";
             });
         });
-    }
+    };
 });