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 910f4f3a0f256f862fa3329ba5d9c0ebb7e1fdf4..8b40e641f771e3a5f843813c240c425eda1fc65d 100644
--- a/src/app/components/home/new-landing/new-landing.component.ts
+++ b/src/app/components/home/new-landing/new-landing.component.ts
@@ -7,7 +7,6 @@ import { LanguageService } from '../../../services/util/language.service';
 import { AuthenticationService } from '../../../services/http/authentication.service';
 import { User } from '../../../models/user';
 import { UserRole } from '../../../models/user-roles.enum';
-import { LoginComponent } from '../../shared/login/login.component';
 
 @Component({
   selector: 'app-new-landing',
@@ -33,18 +32,9 @@ export class NewLandingComponent implements OnInit {
 
   createSession() {
     if (!this.user) {
-      this.openLoginDialog();
-      return;
-    } else if (this.user.role === 0) {
-      if (this.user.isGuest) {
-        this.authenticationService.logout();
-        this.authenticationService.guestLogin(1).subscribe(login => {
-          this.openCreateRoomDialog();
-        });
-      } else {
-        this.authenticationService.logout();
-        this.openLoginDialog();
-      }
+      this.authenticationService.guestLogin(UserRole.CREATOR).subscribe( () => {
+        this.openCreateRoomDialog();
+      });
     } else {
       this.openCreateRoomDialog();
     }
@@ -56,20 +46,6 @@ export class NewLandingComponent implements OnInit {
     });
   }
 
-  openLoginDialog(): void {
-    const dialogRef = this.dialog.open(LoginComponent, {
-      width: '350px'
-    });
-    dialogRef.componentInstance.role = UserRole.CREATOR;
-    dialogRef.componentInstance.isStandard = false;
-    dialogRef.afterClosed()
-      .subscribe(result => {
-        if (this.user) {
-          this.openCreateRoomDialog();
-        }
-      });
-  }
-
   cookiesDisabled(): boolean {
     return localStorage.getItem('cookieAccepted') === 'false';
   }
diff --git a/src/app/components/shared/login/login.component.html b/src/app/components/shared/login/login.component.html
index ff2145d93a8e62d200caf7da7ec586c9a866626e..c5ba17d4665cc69c795a8418f3cd3c1af917abd6 100644
--- a/src/app/components/shared/login/login.component.html
+++ b/src/app/components/shared/login/login.component.html
@@ -1,10 +1,3 @@
-<div fxLayout="column" fxLayoutAlign="space-around">
-  <button id="focus_button_guest" (click)="guestLogin()" class="guest" mat-flat-button type="button" aria-labelledby="guest-login-description"
-          matTooltip="{{'login.guest-login-tooltip' | translate}}">
-    {{ 'login.guest-login' | translate }}
-  </button>
-</div>
-<mat-divider></mat-divider>
 <form
   fxLayout="column"
   fxLayoutGap="10px"
@@ -32,6 +25,10 @@
   <button id="focus_button_user" class="login" mat-flat-button type="submit" aria-labelledby="login-description">
     {{ 'login.login' | translate }}
   </button>
+  <button id="focus_button_guest" (click)="guestLogin()" class="guest" mat-flat-button type="button" aria-labelledby="guest-login-description"
+          matTooltip="{{'login.guest-login-tooltip' | translate}}">
+    {{ 'login.guest-login' | translate }}
+  </button>
   <div class="forgot-password">
     <a
       href=""
diff --git a/src/app/components/shared/login/login.component.scss b/src/app/components/shared/login/login.component.scss
index c9457adb290785690dab230288d2e31aa095cfb9..66dd3af1aad78ae91a292dd57ff8c09db2bc424f 100644
--- a/src/app/components/shared/login/login.component.scss
+++ b/src/app/components/shared/login/login.component.scss
@@ -10,7 +10,7 @@
 .guest {
   background-color: var(--primary);
   color: var(--on-primary);
-  margin: 10px 0 20px 0!important;
+  margin-bottom: 10px;
 }
 
 .login {