diff --git a/src/app/components/home/new-landing/new-landing.component.html b/src/app/components/home/new-landing/new-landing.component.html
index b01150a8ae7fe96536d223b7634a94a66a759f1b..cee66710bc45cd6d5af9f11593c5db76788af1a5 100644
--- a/src/app/components/home/new-landing/new-landing.component.html
+++ b/src/app/components/home/new-landing/new-landing.component.html
@@ -1,6 +1,6 @@
 <div fxLayout="column" fxLayoutAlign="center center" fxlayoutgap="50px" fxFill>
     <app-room-join></app-room-join>
-    <button mat-fab class="fab-extended" color="accent" (click)="openLoginDialog()">
+    <button mat-fab class="fab-extended" color="accent" (click)="createSession()">
       <mat-icon class="add">add</mat-icon>
       Create Session
     </button>
diff --git a/src/app/components/home/new-landing/new-landing.component.ts b/src/app/components/home/new-landing/new-landing.component.ts
index ff4cd5f8a9ed458fbbd62ac8d4be1cce6080ad33..ce9495c6ef1a648e94084a76e35a8c197f7e72d7 100644
--- a/src/app/components/home/new-landing/new-landing.component.ts
+++ b/src/app/components/home/new-landing/new-landing.component.ts
@@ -5,6 +5,8 @@ import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { LanguageService } from '../../../services/util/language.service';
 import { LoginPageComponent } from '../login-page/login-page.component';
+import { AuthenticationService } from '../../../services/http/authentication.service';
+import { User } from '../../../models/user';
 
 @Component({
   selector: 'app-new-landing',
@@ -13,15 +15,27 @@ import { LoginPageComponent } from '../login-page/login-page.component';
 })
 export class NewLandingComponent implements OnInit {
 
+  user: User;
+
   constructor(private router: Router,
               public dialog: MatDialog,
               private translateService: TranslateService,
-              protected langService: LanguageService) {
+              protected langService: LanguageService,
+              public authenticationService: AuthenticationService) {
     langService.langEmitter.subscribe(lang => translateService.use(lang));
   }
 
   ngOnInit() {
     this.translateService.use(localStorage.getItem('currentLang'));
+    this.authenticationService.watchUser.subscribe(newUser => this.user = newUser);
+  }
+
+  createSession() {
+    if (this.user) {
+      this.openCreateRoomDialog();
+    } else {
+      this.openLoginDialog();
+    }
   }
 
   openCreateRoomDialog(): void {