diff --git a/src/app/creator-home-screen/creator-home-screen.component.html b/src/app/creator-home-screen/creator-home-screen.component.html
index f451373084d290c20fd1f7074502babc56b0218e..6a723c40049c481464ac253f56c4310990503119 100644
--- a/src/app/creator-home-screen/creator-home-screen.component.html
+++ b/src/app/creator-home-screen/creator-home-screen.component.html
@@ -3,6 +3,6 @@
     <button mat-raised-button color="primary">Create new room</button>
   </div>
   <div fxLayout="row" fxLayoutAlign="center">
-    <!--<app-room-list></app-room-list>-->
+    <app-room-list></app-room-list>
   </div>
 </div>
diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts
index 145d3f5c11f6f51d0d8c4d2c181de85801c26663..0e244318e437b61182522fb94ba9ce32ddbe42f3 100644
--- a/src/app/login/login.component.ts
+++ b/src/app/login/login.component.ts
@@ -40,7 +40,7 @@ export class LoginComponent implements OnInit {
       this.authenticationService.login(username, password).subscribe(loginSuccessful => {
         if (loginSuccessful) {
           this.notificationService.show('Login successful!');
-          this.router.navigate(['rooms']);
+          this.router.navigate(['creator']);
         } else {
           this.notificationService.show('Login failed!');
         }
diff --git a/src/app/room-list/room-list.component.html b/src/app/room-list/room-list.component.html
index 5c96b0160fa03bc126ea52648f8037ae6535a916..3e2cbb1f4f38a6be1d03dde3f4c32c03206e3466 100644
--- a/src/app/room-list/room-list.component.html
+++ b/src/app/room-list/room-list.component.html
@@ -1,6 +1,6 @@
 <mat-list>
   <mat-list-item *ngFor="let room of rooms">
-    <button mat-button routerLink="room/{{room.id}}">
+    <button mat-button routerLink="/room/{{room.id}}">
       {{room.name}}
     </button>
   </mat-list-item>