diff --git a/src/scripts/site.js b/src/scripts/site.js
index 5a41d3bdba..070bcb43c5 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -62,7 +62,14 @@ var Dashboard = {
         },
         logout: function(logoutWithServer) {
             function onLogoutDone() {
-                Dashboard.navigate("login.html")
+                var loginPage;
+                if (AppInfo.isNativeApp) {
+                    loginPage = "selectserver.html";
+                    window.ApiClient = null;
+                } else {
+                    loginPage = "login.html";
+                }
+                Dashboard.navigate(loginPage);
             }!1 === logoutWithServer ? onLogoutDone() : ConnectionManager.logout().then(onLogoutDone)
         },
         getConfigurationPageUrl: function(name) {
@@ -1033,7 +1040,7 @@ var Dashboard = {
             }, appRouter.showSelectServer = function() {
                 AppInfo.isNativeApp ? Dashboard.navigate("selectserver.html") : Dashboard.navigate("login.html")
             }, appRouter.showWelcome = function() {
-                Dashboard.navigate("login.html")
+                Dashboard.navigate(AppInfo.isNativeApp ? "selectserver.html" : "login.html")
             }, appRouter.showSettings = function() {
                 Dashboard.navigate("mypreferencesmenu.html")
             }, appRouter.showGuide = function() {