diff --git a/src/app/components/login/login.component.ts b/src/app/components/login/login.component.ts
index 3a0eac53..ade03b8b 100644
--- a/src/app/components/login/login.component.ts
+++ b/src/app/components/login/login.component.ts
@@ -43,6 +43,10 @@ export class LoginComponent implements OnInit {
         this.serverService.get(parseInt(server_id, 10)).then((server: Server) => {
             this.server = server;
 
+            if (server.authToken) {
+                this.router.navigate(['/server', this.server.id, 'projects']);
+            }
+
             this.versionService.get(this.server).subscribe((version: Version) => {
                 this.version = version.version;
             });
diff --git a/src/app/components/servers/servers.component.html b/src/app/components/servers/servers.component.html
index 178a1b2e..f627d98b 100644
--- a/src/app/components/servers/servers.component.html
+++ b/src/app/components/servers/servers.component.html
@@ -15,7 +15,7 @@
           <mat-cell *matCellDef="let row">
             <a
               *ngIf="getServerStatus(row) === 'running' || row.location === 'remote' || row.location === 'bundled'"
-              [routerLink]="['/server', row.id, 'projects']"
+              [routerLink]="['/server', row.id, 'login']"
               class="table-link"
               >{{ row.name }}</a
             >