diff --git a/src/controllers/auth/login.js b/src/controllers/auth/login.js
index ceecb2aba3..4296b8bfb3 100644
--- a/src/controllers/auth/login.js
+++ b/src/controllers/auth/login.js
@@ -187,6 +187,9 @@ define(["apphost", "appSettings", "dom", "connectionManager", "loading", "layout
             view.querySelector("#txtManualName").value = "";
             showManualForm(view, true);
         });
+        view.querySelector(".btnSelectServer").addEventListener("click", function () {
+            Dashboard.selectServer();
+        });
         view.addEventListener("viewshow", function (e) {
             loading.show();
 
diff --git a/src/controllers/user/menu.js b/src/controllers/user/menu.js
index 4e0a7824b7..6087beadfe 100644
--- a/src/controllers/user/menu.js
+++ b/src/controllers/user/menu.js
@@ -6,6 +6,10 @@ define(["apphost", "connectionManager", "listViewStyle", "emby-button"], functio
             Dashboard.logout();
         });
 
+        view.querySelector(".selectServer").addEventListener("click", function () {
+            Dashboard.selectServer();
+        });
+
         view.addEventListener("viewshow", function() {
             // this page can also be used by admins to change user preferences from the user edit page
             var userId = params.userId || Dashboard.getCurrentUserId();
diff --git a/src/login.html b/src/login.html
index 21c9d8a347..955ce3879e 100644
--- a/src/login.html
+++ b/src/login.html
@@ -47,9 +47,9 @@
                 <span>${ButtonForgotPassword}</span>
             </button>
 
-            <a is="emby-linkbutton" href="selectserver.html" class="raised block btnSelectServer">
+            <button is="emby-button" type="button" class="raised block btnSelectServer">
                 <span>${ButtonChangeServer}</span>
-            </a>
+            </button>
 
             <p class="disclaimer" style="text-align: center; margin-top: 2em;"></p>
         </div>
diff --git a/src/mypreferencesmenu.html b/src/mypreferencesmenu.html
index 96e9626899..cb63322f31 100644
--- a/src/mypreferencesmenu.html
+++ b/src/mypreferencesmenu.html
@@ -69,7 +69,7 @@
             </div>
             <div class="userSection verticalSection verticalSection-extrabottompadding">
                 <h2 class="sectionTitle" style="padding-left:.25em;">${HeaderUser}</h2>
-                <a is="emby-linkbutton" data-ripple="false" href="selectserver.html" style="display:block;padding:0;margin:0;" class="selectServer hide listItem-border">
+                <a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="selectServer hide listItem-border">
                     <div class="listItem">
                         <i class="material-icons listItemIcon listItemIcon-transparent">wifi</i>
                         <div class="listItemBody">
diff --git a/src/scripts/site.js b/src/scripts/site.js
index 3a10dc85a1..c34b3e475d 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -221,6 +221,13 @@ var Dashboard = {
         };
         appHost.getPushTokenInfo();
         return capabilities = Object.assign(capabilities, appHost.getPushTokenInfo());
+    },
+    selectServer: function () {
+        if (window.NativeShell && typeof window.NativeShell.selectServer === "function") {
+            window.NativeShell.selectServer();
+        } else {
+            Dashboard.navigate("selectserver.html");
+        }
     }
 };