diff --git a/src/controllers/dashboardgeneral.js b/src/controllers/dashboardgeneral.js
index 6a3f80d3a2..c02717fdbb 100644
--- a/src/controllers/dashboardgeneral.js
+++ b/src/controllers/dashboardgeneral.js
@@ -2,15 +2,15 @@ define(["jQuery", "loading", "fnchecked", "emby-checkbox", "emby-textarea", "emb
     "use strict";
 
     function loadPage(page, config, languageOptions, systemInfo) {
-        page.querySelector("#txtServerName").value = config.ServerName;
+        page.querySelector("#txtServerName").value = systemInfo.ServerName;
         if (systemInfo.CanLaunchWebBrowser) {
             page.querySelector("#fldRunWebAppAtStartup").classList.remove("hide");
         } else {
             page.querySelector("#fldRunWebAppAtStartup").classList.add("hide");
         }
-        page.querySelector("#txtCachePath").value = config.CachePath || "";
-        $("#txtMetadataPath", page).val(config.MetadataPath || "");
-        $("#txtMetadataNetworkPath", page).val(config.MetadataNetworkPath || "");
+        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>"
         })).val(config.UICulture);
diff --git a/src/controllers/dashboardpage.js b/src/controllers/dashboardpage.js
index 5fb20f953c..c0a363d65c 100644
--- a/src/controllers/dashboardpage.js
+++ b/src/controllers/dashboardpage.js
@@ -177,9 +177,9 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
 
     function reloadSystemInfo(view, apiClient) {
         apiClient.getSystemInfo().then(function (systemInfo) {
-            view.querySelector("#serverName").innerHTML = globalize.translate("LabelServerName", systemInfo.ServerName);
+            view.querySelector("#serverName").innerHTML = globalize.translate("DashboardServerName", systemInfo.ServerName);
 
-            var localizedVersion = globalize.translate("LabelVersionNumber", systemInfo.Version);
+            var localizedVersion = globalize.translate("DashboardVersionNumber", systemInfo.Version);
             if (systemInfo.SystemUpdateLevel && "Release" != systemInfo.SystemUpdateLevel) {
                 localizedVersion += " " + globalize.translate("Option" + systemInfo.SystemUpdateLevel).toLowerCase();
             }
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 249d958900..eda4b8805b 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -801,7 +801,7 @@
     "LabelSeriesRecordingPath": "Series recording path (optional):",
     "LabelServerHost": "Host:",
     "LabelServerHostHelp": "192.168.1.100 or https://myserver.com",
-    "LabelServerName": "Server Name: {0}",
+    "LabelServerName": "Server name:",
     "LabelServerPort": "Port:",
     "LabelSimultaneousConnectionLimit": "Simultaneous stream limit:",
     "LabelSkin": "Skin:",
@@ -866,9 +866,10 @@
     "LabelValue": "Value:",
     "LabelVersion": "Version:",
     "LabelVersionInstalled": "{0} installed",
-    "LabelVersionNumber": "Version: {0}",
+    "DashboardVersionNumber": "Version: {0}",
+    "DashboardServerName": "Server: {0}",
     "LabelVideo": "Video:",
-    "LabelWeb": "Web",
+    "LabelWeb": "Web: ",
     "LabelXDlnaCap": "X-Dlna cap:",
     "LabelXDlnaCapHelp": "Determines the content of the X_DLNACAP element in the urn:schemas-dlna-org:device-1-0 namespace.",
     "LabelXDlnaDoc": "X-Dlna doc:",