diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.ts b/src/app/components/creator/room-creator-page/room-creator-page.component.ts
index b9b06e474bcf9298f0f5476017a29a1fe4afd306..4b9017a7efd4273e8c0465bdb6b4215f9d39e89f 100644
--- a/src/app/components/creator/room-creator-page/room-creator-page.component.ts
+++ b/src/app/components/creator/room-creator-page/room-creator-page.component.ts
@@ -135,7 +135,6 @@ export class RoomCreatorPageComponent extends RoomPageComponent implements OnIni
           return;
         } else {
           if (result instanceof CommentSettingsDialog) {
-            console.log(result);
             this.updateCommentSettings(result);
             this.saveChanges();
           }
diff --git a/src/app/components/shared/_dialogs/delete-account/delete-account.component.html b/src/app/components/shared/_dialogs/delete-account/delete-account.component.html
index 21d0304780a0fd75467ea755cd170632c04a13ae..4611f83d874878904afc9e45deec53b66932a8f5 100644
--- a/src/app/components/shared/_dialogs/delete-account/delete-account.component.html
+++ b/src/app/components/shared/_dialogs/delete-account/delete-account.component.html
@@ -1,14 +1,16 @@
-<h3>{{ 'header.sure' | translate }}</h3>
-<mat-divider></mat-divider>
-<p>{{ 'header.really-delete-account' | translate }}</p>
-<mat-list *ngFor="let room of rooms; let i = index">
-  <mat-list-item><strong>{{ i+1 }}:  {{ room.name }}</strong></mat-list-item>
-</mat-list>
-<div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="10px">
-  <button mat-raised-button class="abort" (click)="close('abort')">
-    {{ 'header.abort' | translate }}
-  </button>
-  <button mat-raised-button class="delete" (click)="close('delete')">
-    {{ 'header.delete' | translate }}
-  </button>
+<div mat-dialog-content>
+  <h3>{{ 'header.sure' | translate }}</h3>
+  <mat-divider></mat-divider>
+  <p>{{ 'header.really-delete-account' | translate }}</p>
+  <ul *ngFor="let room of rooms">
+    <li>{{ room.name }}</li>
+  </ul>
+  <div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="10px">
+    <button mat-raised-button class="abort" (click)="close('abort')">
+      {{ 'header.abort' | translate }}
+    </button>
+    <button mat-raised-button class="delete" (click)="close('delete')">
+      {{ 'header.delete' | translate }}
+    </button>
+  </div>
 </div>
diff --git a/src/app/components/shared/_dialogs/delete-account/delete-account.component.scss b/src/app/components/shared/_dialogs/delete-account/delete-account.component.scss
index dcc4bad13389409c758cb63ebfe1717fa20538cf..58f145905e35e7ec71b5c5f4a30fa6e7317e21fe 100644
--- a/src/app/components/shared/_dialogs/delete-account/delete-account.component.scss
+++ b/src/app/components/shared/_dialogs/delete-account/delete-account.component.scss
@@ -21,6 +21,6 @@ button {
   color: var(--on-secondary);
 }
 
-.mat-list-item {
+li {
   color: var(--on-surface);
 }
diff --git a/src/app/components/shared/_dialogs/delete-account/delete-account.component.ts b/src/app/components/shared/_dialogs/delete-account/delete-account.component.ts
index 7f88f7f3456bb93296fa6fc9e33f62aef2b76cae..3e303b59047bda82064ae64db3d29ae6d3e91fdd 100644
--- a/src/app/components/shared/_dialogs/delete-account/delete-account.component.ts
+++ b/src/app/components/shared/_dialogs/delete-account/delete-account.component.ts
@@ -20,10 +20,18 @@ export class DeleteAccountComponent implements OnInit {
   ngOnInit() {
     this.roomService.getCreatorRooms().subscribe(rooms => {
       this.rooms = rooms;
+      this.sortRooms();
     });
   }
 
   close(type: string): void {
     this.dialogRef.close(type);
   }
+
+  sortRooms() {
+    const roomList = this.rooms.sort((a, b) => {
+      return a.name > b.name ? 1 : -1;
+    });
+    this.rooms = roomList;
+  }
 }
diff --git a/src/app/components/shared/header/header.component.ts b/src/app/components/shared/header/header.component.ts
index 4d9bf53be925441ef99ebcb3746440ddae2312b1..9206dbf607b6bce4f65fe6dd12fb025d5f7d8973 100644
--- a/src/app/components/shared/header/header.component.ts
+++ b/src/app/components/shared/header/header.component.ts
@@ -116,7 +116,8 @@ export class HeaderComponent implements OnInit {
 
   openDeleteUserDialog() {
     const dialogRef = this.dialog.open(DeleteAccountComponent, {
-      width: '600px'
+      width: '600px',
+      autoFocus: false
     });
     dialogRef.afterClosed()
       .subscribe(result => {