diff --git a/src/app/comment.service.ts b/src/app/comment.service.ts
index af4feb56941aa2f19501288812013c89c8855b8d..c969de6e0dceb915c756ceb20325d6d8a4540531 100644
--- a/src/app/comment.service.ts
+++ b/src/app/comment.service.ts
@@ -40,7 +40,7 @@ export class CommentService extends ErrorHandlingService {
     );
   }
 
-  searchComments(roomId: string, userId: number): Observable<Comment[]> {
+  searchComments(roomId: string, userId: string): Observable<Comment[]> {
     const url = `${this.commentsUrl}/?roomId=${roomId}&userId=${userId}`;
     return this.http.get<Comment[]>(url).pipe(
       tap (_ => ''),
diff --git a/src/app/comment.ts b/src/app/comment.ts
index 4cf12e8cf2efcba7da36ef727db8702d82870e9a..ed636d119cf2032562b9c8ac0d958b6c24ece93d 100644
--- a/src/app/comment.ts
+++ b/src/app/comment.ts
@@ -1,7 +1,7 @@
 export class Comment {
   id: string;
   roomId: string;
-  userId: number;
+  userId: string;
   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 3d62dfa17e3017d5c45b0519e606b68ea0a7b7d2..f999946d7b8b55e16344b2db9a189b6c70fe1418 100644
--- a/src/app/create-comment/create-comment.component.ts
+++ b/src/app/create-comment/create-comment.component.ts
@@ -46,8 +46,9 @@ export class CreateCommentComponent implements OnInit {
       return;
     }
     this.commentService.addComment({
+      id: this.room.id + this.user.userId,
       roomId: this.room.id,
-      userId: this.user.id,
+      userId: this.user.userId,
       subject: subject,
       body: body,
       creationTimestamp: new Date(Date.now())