diff --git a/src/controllers/mypreferencescommon.js b/src/controllers/mypreferencescommon.js
index e52fcc1b34..51e9c10869 100644
--- a/src/controllers/mypreferencescommon.js
+++ b/src/controllers/mypreferencescommon.js
@@ -31,7 +31,7 @@ define(["apphost", "connectionManager", "listViewStyle", "emby-button"], functio
             });
 
             Dashboard.getCurrentUser().then(function(user) {
-                page.querySelector(".headerUser").innerHTML = user.Name;
+                page.querySelector(".headerUsername").innerHTML = user.Name;
                 if (user.Policy.IsAdministrator) {
                     page.querySelector(".adminSection").classList.remove("hide");
                 } else {
diff --git a/src/mypreferencesmenu.html b/src/mypreferencesmenu.html
index 7269fe3521..b9c02fc02c 100644
--- a/src/mypreferencesmenu.html
+++ b/src/mypreferencesmenu.html
@@ -3,6 +3,7 @@
     <div class="padded-left padded-right padded-bottom-page padded-top">
         <div class="readOnlyContent" style="margin: 0 auto;">
             <div class="verticalSection verticalSection-extrabottompadding">
+                <h2 class="sectionTitle headerUsername" style="padding-left:.25em;"></h2>
                 <a is="emby-linkbutton" style="display:block; padding: 0; margin:0;" data-ripple="false" href="#" class="lnkMyProfile listItem-border">
                     <div class="listItem">
                         <i class="md-icon listItemIcon listItemIcon-transparent">person</i>
@@ -49,28 +50,6 @@
                 </a>
             </div>
             <div class="verticalSection verticalSection-extrabottompadding">
-                <h2 class="sectionTitle headerUser" style="padding-left:.25em;"></h2>
-                <div>
-                    <a is="emby-linkbutton" style="display:block; padding: 0; margin:0;" data-ripple="false" href="selectserver.html" class="selectServer hide listItem-border">
-                        <div class="listItem">
-                            <i class="md-icon listItemIcon listItemIcon-transparent">wifi</i>
-                            <div class="listItemBody">
-                                <div class="listItemBodyText">${HeaderSelectServer}</div>
-                            </div>
-                        </div>
-                    </a>
-                    <a is="emby-linkbutton" style="display:block; padding: 0; margin:0;" data-ripple="false" href="#" class="btnLogout hide listItem-border">
-                        <div class="listItem">
-                            <i class="md-icon listItemIcon listItemIcon-transparent">exit_to_app</i>
-                            <div class="listItemBody">
-                                <div class="listItemBodyText">${ButtonSignOut}</div>
-                            </div>
-                        </div>
-                    </a>
-                </div>
-            </div>
-
-            <div class="adminSection hide verticalSection verticalSection-extrabottompadding">
                 <h2 class="sectionTitle" style="padding-left:.25em;">${HeaderAdmin}</h2>
                 <div>
                     <a is="emby-linkbutton" href="dashboard.html" style="display: block; padding: 0; margin:0;" class="listItem-border">
@@ -93,6 +72,30 @@
                     </a>
                 </div>
             </div>
+
+            <div class="adminSection hide verticalSection verticalSection-extrabottompadding">
+                <h2 class="sectionTitle" style="padding-left:.25em;">${HeaderUser}</h2>
+                <div>
+                    <a is="emby-linkbutton" style="display:block; padding: 0; margin:0;" data-ripple="false" href="selectserver.html" class="selectServer hide listItem-border">
+                        <div class="listItem">
+                            <i class="md-icon listItemIcon listItemIcon-transparent">wifi</i>
+                            <div class="listItemBody">
+                                <div class="listItemBodyText">${HeaderSelectServer}</div>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+                <div>
+                    <a is="emby-linkbutton" style="display:block; padding: 0; margin:0;" data-ripple="false" href="#" class="btnLogout hide listItem-border">
+                        <div class="listItem">
+                            <i class="md-icon listItemIcon listItemIcon-transparent">exit_to_app</i>
+                            <div class="listItemBody">
+                                <div class="listItemBodyText">${ButtonSignOut}</div>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+            </div>
         </div>
     </div>
 </div>
\ No newline at end of file