diff --git a/src/app/components/creator/_dialogs/room-edit/room-edit.component.html b/src/app/components/creator/_dialogs/room-edit/room-edit.component.html
index 9ee31f0d57d6a590ae5d4fe5040bc76c271b6f9e..479407610b062b8325e81f40290498c157238ec5 100644
--- a/src/app/components/creator/_dialogs/room-edit/room-edit.component.html
+++ b/src/app/components/creator/_dialogs/room-edit/room-edit.component.html
@@ -58,16 +58,10 @@
     <div fxLayoutAlign="center center">
       <mat-slide-toggle [(ngModel)]= "check">{{ 'room-page.block' | translate }}</mat-slide-toggle>
     </div>
-    <div fxLayoutAlign="center center" fxLayout="column">
-      <mat-slide-toggle (change)="showMessage('words-will-be-overwritten', $event.checked)" [(ngModel)]= "profanityCheck">
+    <div fxLayoutAlign="center center">
+      <mat-slide-toggle (change)="showMessage('words-will-be-overwritten')" [(ngModel)]= "profanityCheck">
         {{ 'room-page.profanity-filter' | translate }}
       </mat-slide-toggle>
-      <mat-slide-toggle *ngIf="profanityCheck" (change)="showMessage('only-specific-language-will-be-filtered', $event.checked)" [(ngModel)]= "censorLanguageSpecificCheck">
-        {{ 'room-page.language-specific-filter' | translate }}
-      </mat-slide-toggle>
-      <mat-slide-toggle *ngIf="profanityCheck" (change)="showMessage('partial-words-will-be-filtered', $event.checked)" [(ngModel)]= "censorPartialWordsCheck">
-        {{ 'room-page.partial-words-filter' | translate }}
-      </mat-slide-toggle>
     </div>
     <div fxLayoutAlign="center center">
       <!-- <input type="checkbox" id= "myCheck" [(ngModel)]= "check" > -->
diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html
index 4c59c2f5e1e7c74cf1161d284cecab33ccf19d1c..1ce1a2e7d0df40a592bc324266b10ce9dee9efb5 100644
--- a/src/app/components/shared/header/header.component.html
+++ b/src/app/components/shared/header/header.component.html
@@ -366,8 +366,8 @@
                 [ngClass]="{'color-warn': room && room.questionsBlocked}"
                 tabindex="0">
           <mat-icon class="color-warn">block</mat-icon>
-          <span *ngIf="name">{{'header.block' | translate}}</span> 
-          <span *ngIf="!name">{{'header.unlock' | translate}}</span> 
+          <span *ngIf="!room.questionsBlocked">{{'header.block' | translate}}</span> 
+          <span *ngIf="room.questionsBlocked">{{'header.unlock' | translate}}</span> 
         </button>
       </ng-container>
 
diff --git a/src/app/components/shared/header/header.component.ts b/src/app/components/shared/header/header.component.ts
index 54175a487a33669a33a8133d5330d101d6d0e3ba..67ce2e12f0318a7b94a368d89cce87985e87a93d 100644
--- a/src/app/components/shared/header/header.component.ts
+++ b/src/app/components/shared/header/header.component.ts
@@ -32,7 +32,6 @@ import { WorkerDialogComponent } from '../_dialogs/worker-dialog/worker-dialog.c
   styleUrls: ['./header.component.scss']
 })
 export class HeaderComponent implements OnInit {
-  name = true;
   user: User;
   cTime: string;
   shortId: string;
@@ -321,7 +320,6 @@ export class HeaderComponent implements OnInit {
     // flip state if clicked
     this.room.questionsBlocked = !this.room.questionsBlocked;
     this.roomService.updateRoom(this.room).subscribe(r => this.room = r);
-    this.name = false;
   }
 
   public startWorkerDialog() {