diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index eddb7fb7b008eb9eb078456aabecf6ff9dab59c0..dceef4a22978159ad9b268808188a9d015b2b6aa 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -6,13 +6,17 @@ import { TransferComponent } from './transfer/transfer.component';
 import { ShareconnectComponent } from './shareconnect/shareconnect.component';
 import { JoblistComponent } from './joblist/joblist.component';
 
+import {LoginComponent} from './login/login.component';
+
 
 // import { TokenextractorComponent } from './tokenextractor/tokenextractor.component';
 
 
 const routes: Routes = [
   { path: '', redirectTo: 'launch', pathMatch: 'full'},
-  { path: 'launch', component: JoblistComponent},
+  //{ path: 'launch', component: JoblistComponent},
+  { path: 'launch', component: LauncherComponent},
+  { path: 'login', component: LoginComponent},
   //  { path: 'finishlaunch', component: LauncherComponent},
   //{ path: 'cancellaunch', component: LauncherComponent},
   { path: 'sshauthz_callback', component: KeygenComponent},
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 8a5de05b2ec20b5ffef9d96dc6fd63391e6b4d32..0233606cc7accfcd1674059c7c33491cadb54eda 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -6,5 +6,5 @@
 <router-outlet></router-outlet>
 </div> -->
 
-<app-launcher></app-launcher>
-<!--<router-outlet></router-outlet>-->
+<!--<app-launcher></app-launcher>-->
+<router-outlet></router-outlet>
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 2db06c72b4afdd5565b14b7f1101eb779b1ed03d..926328e468aa0067fa4e1abeaaa0d776ad0e0de2 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -48,6 +48,7 @@ import { ShareconnectComponent } from './shareconnect/shareconnect.component';
 import { LaunchDialogComponent } from './launch-dialog/launch-dialog.component';
 import { ModaldialogComponent } from './modaldialog/modaldialog.component'
 import {OverlayModule} from '@angular/cdk/overlay';
+import { LoginComponent } from './login/login.component';
 
 // import { FileExplorerModule } from './file-explorer/file-explorer.module';
 
@@ -71,6 +72,7 @@ import {OverlayModule} from '@angular/cdk/overlay';
     ShareconnectComponent,
     LaunchDialogComponent,
     ModaldialogComponent,
+    LoginComponent,
   ],
   imports: [
   BrowserModule,
diff --git a/src/app/launcher/launcher.component.html b/src/app/launcher/launcher.component.html
index a7400ba8202e2befef30faf86de9bda3ad34bba8..ad8095ebb48306748f933a8e84e7d3e7132d1eb6 100644
--- a/src/app/launcher/launcher.component.html
+++ b/src/app/launcher/launcher.component.html
@@ -75,8 +75,8 @@
 	</mat-accordion>
 </mat-sidenav>
 
-<!--<app-joblist [identity]="(identitySubject | async)"></app-joblist>-->
-  <router-outlet></router-outlet>
+<app-joblist [identity]="(identitySubject | async)"></app-joblist>
+<!--<router-outlet></router-outlet>-->
   <div fxFlex></div>
 
 </mat-sidenav-container>