diff --git a/src/scripts/mypreferencescommon.js b/src/scripts/mypreferencescommon.js
index c530787aa8..e7c58e64ef 100644
--- a/src/scripts/mypreferencescommon.js
+++ b/src/scripts/mypreferencescommon.js
@@ -4,13 +4,35 @@ define(["apphost", "connectionManager", "listViewStyle", "emby-linkbutton"], fun
         view.querySelector(".btnLogout").addEventListener("click", function() {
             Dashboard.logout()
         }), view.addEventListener("viewshow", function() {
-            var page = this,
-                userId = params.userId || Dashboard.getCurrentUserId();
-            page.querySelector(".lnkDisplayPreferences").setAttribute("href", "mypreferencesdisplay.html?userId=" + userId), page.querySelector(".lnkLanguagePreferences").setAttribute("href", "mypreferenceslanguages.html?userId=" + userId), page.querySelector(".lnkSubtitleSettings").setAttribute("href", "mypreferencessubtitles.html?userId=" + userId), page.querySelector(".lnkHomeScreenPreferences").setAttribute("href", "mypreferenceshome.html?userId=" + userId), page.querySelector(".lnkMyProfile").setAttribute("href", "myprofile.html?userId=" + userId), page.querySelector(".lnkSync").setAttribute("href", "mysyncsettings.html?userId=" + userId), page.querySelector(".lnkCameraUpload").setAttribute("href", "camerauploadsettings.html?userId=" + userId), appHost.supports("cameraupload") ? page.querySelector(".lnkCameraUpload").classList.remove("hide") : page.querySelector(".lnkCameraUpload").classList.add("hide"), appHost.supports("sync") ? page.querySelector(".lnkSync").classList.remove("hide") : page.querySelector(".lnkSync").classList.add("hide"), connectionManager.user(ApiClient).then(function(user) {
-                !user.localUser || user.localUser.EnableAutoLogin && !user.connectUser ? view.querySelector(".btnLogout").classList.add("hide") : view.querySelector(".btnLogout").classList.remove("hide")
-            }), Dashboard.getCurrentUser().then(function(user) {
-                page.querySelector(".headerUser").innerHTML = user.Name, user.Policy.IsAdministrator ? page.querySelector(".adminSection").classList.remove("hide") : page.querySelector(".adminSection").classList.add("hide")
-            }), appHost.supports("multiserver") ? page.querySelector(".selectServer").classList.remove("hide") : page.querySelector(".selectServer").classList.add("hide")
+            var page = this;
+            var userId = params.userId || Dashboard.getCurrentUserId();
+
+            page.querySelector(".lnkDisplayPreferences").setAttribute("href", "mypreferencesdisplay.html?userId=" + userId);
+            page.querySelector(".lnkLanguagePreferences").setAttribute("href", "mypreferenceslanguages.html?userId=" + userId);
+            page.querySelector(".lnkSubtitleSettings").setAttribute("href", "mypreferencessubtitles.html?userId=" + userId);
+            page.querySelector(".lnkHomeScreenPreferences").setAttribute("href", "mypreferenceshome.html?userId=" + userId);
+            page.querySelector(".lnkMyProfile").setAttribute("href", "myprofile.html?userId=" + userId);
+            page.querySelector(".lnkSync").setAttribute("href", "mysyncsettings.html?userId=" + userId);
+            page.querySelector(".lnkCameraUpload").setAttribute("href", "camerauploadsettings.html?userId=" + userId);
+
+            appHost.supports("cameraupload")
+                ? page.querySelector(".lnkCameraUpload").classList.remove("hide")
+                : page.querySelector(".lnkCameraUpload").classList.add("hide");
+
+            appHost.supports("sync")
+                ? page.querySelector(".lnkSync").classList.remove("hide")
+                : page.querySelector(".lnkSync").classList.add("hide");
+
+            connectionManager.user(ApiClient).then(function(user) {
+                user.localUser && !user.localUser.EnableAutoLogin ? view.querySelector(".btnLogout").classList.add("hide") : view.querySelector(".btnLogout").classList.remove("hide");
+            });
+
+            Dashboard.getCurrentUser().then(function(user) {
+                page.querySelector(".headerUser").innerHTML = user.Name;
+                user.Policy.IsAdministrator ? page.querySelector(".adminSection").classList.remove("hide") : page.querySelector(".adminSection").classList.add("hide");
+            });
+
+            appHost.supports("multiserver") ? page.querySelector(".selectServer").classList.remove("hide") : page.querySelector(".selectServer").classList.add("hide");
         })
     }
 });
\ No newline at end of file