diff --git a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html
index 6307ff402b989cb823cba5a1318091d6381eb837..f51d41b2e73c1ca0033d6f60867ce952f7ef9781 100644
--- a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html
+++ b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html
@@ -12,7 +12,7 @@
 
     <mat-accordion hideToggle class="new-Badword" multi>
       <mat-expansion-panel class="color-background"
-                          (opened)="enterBadword = true"
+                          (opened)="enterBadword = true; focusBadWordInput()"
                           (closed)="enterBadword = false">
       <mat-expansion-panel-header class="color-background">
           <mat-panel-description>
@@ -23,7 +23,7 @@
 
         <mat-form-field>
           <mat-label>{{'topic-cloud-dialog.enter-word' | translate}}</mat-label>
-          <input [(ngModel)]="newBadWord" matInput>
+          <input matInput id="bad-word-input" [(ngModel)]="newBadWord">
         </mat-form-field>
 
         <button mat-button color="primary" (click)="addBadword()">
@@ -120,7 +120,7 @@
                         (searchMode ? filteredKeywords : keywords); let i = index" [attr.data-index]="i">
       <mat-expansion-panel-header class="color-surface">
         <mat-panel-title [ngClass]="{'edit-keyword': editedKeyword}">
-          {{keyword.keyword}}
+          {{profanityFilter ? getKeywordWithoutProfanity(keyword.keyword) : keyword.keyword}}
         </mat-panel-title>
         <mat-panel-description>
           {{keyword.questions.length}}
diff --git a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts
index 95603db541c1756bae36ff6ce46424af3cd4dbc4..180a6f982f14d7d7fa3ab892c9b3b37627e53caa 100644
--- a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts
+++ b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts
@@ -81,7 +81,7 @@ export class TopicCloudAdministrationComponent implements OnInit {
     },
     {
       keywordID: 6,
-      keyword: 'Profanity',
+      keyword: 'Arsch',
       questions: [
         'Das ist eine Testfrage fuer den Profanity Filter, du Arschloch',
         'Englisch: Fuck you!',
@@ -94,6 +94,10 @@ export class TopicCloudAdministrationComponent implements OnInit {
 
   ];
 
+  getKeywordWithoutProfanity(keyword: string): string {
+    return this.topicCloudAdminService.filterProfanityWords(keyword);
+  }
+
   constructor(public cloudDialogRef: MatDialogRef<TagCloudComponent>,
               public confirmDialog: MatDialog,
               private notificationService: NotificationService,
@@ -240,6 +244,12 @@ export class TopicCloudAdministrationComponent implements OnInit {
     return undefined;
   }
 
+  focusBadWordInput() {
+    setTimeout(() => {
+      document.getElementById('bad-word-input').focus();
+    }, 100);
+  }
+
   keywordtoSpacy(text: string,model: string) {
     for (const keyword of this.keywords) {
       if (keyword.keyword===text) {