diff --git a/src/app/comment-list/comment-list.component.html b/src/app/comment-list/comment-list.component.html
index cafb9025695298a4c7f411d1e682f026ecc64df3..53058da0a97dc507907ae257dc27c312d40a651d 100644
--- a/src/app/comment-list/comment-list.component.html
+++ b/src/app/comment-list/comment-list.component.html
@@ -7,7 +7,7 @@
 
             {{comment.body}}
 
-            <div class="body-buttons" *ngIf="userRole === CREATOR">
+            <div class="body-buttons" *ngIf="userRole === userRoleTemp">
               <button *ngIf="!comment.read" mat-fab color="warn" matTooltip="Is not read" (click)="setRead(comment)">
                 <mat-icon>clear</mat-icon>
               </button>
@@ -27,6 +27,6 @@
         </mat-card><br>
       </div>
 
-    <button *ngIf="userRole === CREATOR" mat-raised-button color="primary" (click)="goBack()">Back</button>
+    <button *ngIf="userRole === userRoleTemp" mat-raised-button color="primary" (click)="goBack()">Back</button>
   </div>
 </div>
diff --git a/src/app/comment-list/comment-list.component.ts b/src/app/comment-list/comment-list.component.ts
index 9c758e770d25cbd7aa6ea20a2b8e01163c0b5ce9..64a0dc40384c141f694d8ccddc4f00f36f643807 100644
--- a/src/app/comment-list/comment-list.component.ts
+++ b/src/app/comment-list/comment-list.component.ts
@@ -15,6 +15,7 @@ import { User } from '../user';
   styleUrls: ['./comment-list.component.scss']
 })
 export class CommentListComponent implements OnInit {
+  userRoleTemp: any = UserRole.CREATOR;
   userRole: UserRole;
   user: User;
   comments: Comment[];
@@ -43,9 +44,13 @@ export class CommentListComponent implements OnInit {
   }
 
   getComments(roomId: string): void {
-    console.log(this.user.id);
-    this.commentService.searchComments(roomId, this.user.id)
-      .subscribe(comments => this.comments = comments);
+    if (this.userRole === UserRole.CREATOR) {
+      this.commentService.getComments(roomId)
+        .subscribe(comments => this.comments = comments);
+    } else if (this.userRole === UserRole.PARTICIPANT) {
+      this.commentService.searchComments(roomId, this.user.id)
+        .subscribe(comments => this.comments = comments);
+    }
   }
 
   setRead(comment: Comment): void {
diff --git a/src/app/comment.ts b/src/app/comment.ts
index ed636d119cf2032562b9c8ac0d958b6c24ece93d..4cf12e8cf2efcba7da36ef727db8702d82870e9a 100644
--- a/src/app/comment.ts
+++ b/src/app/comment.ts
@@ -1,7 +1,7 @@
 export class Comment {
   id: string;
   roomId: string;
-  userId: string;
+  userId: number;
   revision: string;
   subject: string;
   body: string;
diff --git a/src/app/create-comment/create-comment.component.ts b/src/app/create-comment/create-comment.component.ts
index dedf7e08db4269eefbed5229614b1e3a7869454d..3d62dfa17e3017d5c45b0519e606b68ea0a7b7d2 100644
--- a/src/app/create-comment/create-comment.component.ts
+++ b/src/app/create-comment/create-comment.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, OnInit, Input, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Location } from '@angular/common';
 import { Room } from '../room';
@@ -8,6 +8,7 @@ import { CommentService } from '../comment.service';
 import { NotificationService } from '../notification.service';
 import { AuthenticationService } from '../authentication.service';
 import { User } from '../user';
+import { CommentListComponent } from '../comment-list/comment-list.component';
 
 @Component({
   selector: 'app-create-comment',
@@ -15,6 +16,7 @@ import { User } from '../user';
   styleUrls: ['./create-comment.component.scss']
 })
 export class CreateCommentComponent implements OnInit {
+  @ViewChild(CommentListComponent) child: CommentListComponent;
   @Input() room: Room;
   user: User;
 
@@ -50,6 +52,7 @@ export class CreateCommentComponent implements OnInit {
       body: body,
       creationTimestamp: new Date(Date.now())
     } as Comment).subscribe(() => {
+      this.child.getComments(this.room.id);
       this.notification.show(`Comment '${subject}' successfully created.`);
     });
   }