diff --git a/dashboard-ui/mypreferencesmenu.html b/dashboard-ui/mypreferencesmenu.html
index 64fad7208c..b9d13ed5db 100644
--- a/dashboard-ui/mypreferencesmenu.html
+++ b/dashboard-ui/mypreferencesmenu.html
@@ -62,23 +62,23 @@
                     </a>
                 </div>
 
-                <div class="userSection hide">
+                <div>
                     <h1 class="headerUser"></h1>
                     <div class="paperList">
-                        <a href="selectserver.html" class="clearLink">
+                        <a href="selectserver.html" class="clearLink selectServer hide">
                             <paper-icon-item>
                                 <paper-fab mini icon="wifi" style="background-color: #444;" item-icon></paper-fab>
                                 <paper-item-body two-line>
                                     <div>${HeaderSelectServer}</div>
                                 </paper-item-body>
                             </paper-icon-item>
-                            <paper-icon-item class="btnLogout">
-                                <paper-fab mini icon="lock" style="background-color: #444;" item-icon></paper-fab>
-                                <paper-item-body two-line>
-                                    <div>${ButtonSignOut}</div>
-                                </paper-item-body>
-                            </paper-icon-item>
                         </a>
+                        <paper-icon-item class="btnLogout">
+                            <paper-fab mini icon="lock" style="background-color: #444;" item-icon></paper-fab>
+                            <paper-item-body two-line>
+                                <div>${ButtonSignOut}</div>
+                            </paper-item-body>
+                        </paper-icon-item>
                     </div>
                 </div>
 
diff --git a/dashboard-ui/scripts/mypreferencescommon.js b/dashboard-ui/scripts/mypreferencescommon.js
index e353217527..a53361bd62 100644
--- a/dashboard-ui/scripts/mypreferencescommon.js
+++ b/dashboard-ui/scripts/mypreferencescommon.js
@@ -38,10 +38,10 @@ pageIdOn('pageshow', 'myPreferencesMenuPage', function () {
         }
     });
 
-    if (AppInfo.isNativeApp && browserInfo.safari) {
-        page.querySelector('.userSection').classList.remove('hide');
+    if (Dashboard.isConnectMode()) {
+        page.querySelector('.selectServer').classList.remove('hide');
     } else {
-        page.querySelector('.userSection').classList.add('hide');
+        page.querySelector('.selectServer').classList.add('hide');
     }
 
 });
\ No newline at end of file
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index b4d2e4f371..0bd9e1235e 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -704,36 +704,7 @@ var Dashboard = {
 
     showUserFlyout: function () {
 
-        require(['jqmpanel'], function () {
-            var html = '<div data-role="panel" data-position="right" data-display="overlay" id="userFlyout" data-position-fixed="true" data-theme="a">';
-
-            html += '<h3 class="userHeader">';
-
-            html += '</h3>';
-
-            html += '<form>';
-
-            html += '<p class="preferencesContainer"></p>';
-
-            html += '<p><button data-mini="true" type="button" onclick="Dashboard.logout();" data-icon="lock">' + Globalize.translate('ButtonSignOut') + '</button></p>';
-
-            html += '</form>';
-            html += '</div>';
-
-            $(document.body).append(html);
-
-            var userFlyout = document.querySelector('#userFlyout');
-            ImageLoader.lazyChildren(userFlyout);
-
-            $(userFlyout).panel({}).panel("open").on("panelclose", function () {
-
-                $(this).off("panelclose").remove();
-            });
-
-            ConnectionManager.user(window.ApiClient).then(function (user) {
-                Dashboard.updateUserFlyout(userFlyout, user);
-            });
-        });
+        Dashboard.navigate('mypreferencesmenu.html?userId=' + ApiClient.getCurrentUserId());
     },
 
     updateUserFlyout: function (elem, user) {