diff --git a/src/components/appRouter.js b/src/components/appRouter.js
index b21929d254..b0a1489aed 100644
--- a/src/components/appRouter.js
+++ b/src/components/appRouter.js
@@ -202,13 +202,7 @@ class AppRouter {
                 this.goHome();
                 break;
             case 'ServerSignIn':
-                result.ApiClient.getPublicUsers().then((users) => {
-                    if (users.length) {
-                        this.showLocalLogin(result.Servers[0].Id);
-                    } else {
-                        this.showLocalLogin(result.Servers[0].Id, true);
-                    }
-                });
+                this.showLocalLogin(result.ApiClient.serverId());
                 break;
             case 'ServerSelection':
                 this.showSelectServer();