diff --git a/src/app/modules/shared/components/search-user/search-user.component.html b/src/app/modules/shared/components/search-user/search-user.component.html
index 05a214947..b141cf65b 100644
--- a/src/app/modules/shared/components/search-user/search-user.component.html
+++ b/src/app/modules/shared/components/search-user/search-user.component.html
@@ -1,7 +1,7 @@
 <div class="form-group" >
   <label>Users: </label>
 
-  <ng-select [(ngModel)]="selectedUser" placeholder="Select user" (change)="updateUser()" class="selectUser">
+  <ng-select [(ngModel)]="selectedUser" [multiple]="true"  placeholder="Select user" (change)="updateUser()" class="selectUser">
     <ng-option  *ngFor="let user of users" value={{user.id}}>👤{{user.name}}📨{{ user.email}}</ng-option >
   </ng-select>
 
diff --git a/src/app/modules/shared/components/search-user/search-user.component.ts b/src/app/modules/shared/components/search-user/search-user.component.ts
index 4ed732f3c..645986986 100644
--- a/src/app/modules/shared/components/search-user/search-user.component.ts
+++ b/src/app/modules/shared/components/search-user/search-user.component.ts
@@ -9,14 +9,14 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
 export class SearchUserComponent {
 
   readonly ALLOW_SELECT_MULTIPLE = true;
-  selectedUser: string;
+  selectedUser: string[];
 
   @Input() users: string[] = [];
 
-  @Output() selectedUserId = new EventEmitter<string>();
+  @Output() selectedUserId = new EventEmitter<string[]>();
 
   updateUser() {
-    this.selectedUserId.emit(this.selectedUser || '*');
+    this.selectedUserId.emit(this.selectedUser.length === 0 ? ['*'] : this.selectedUser);
   }
 }
 
diff --git a/src/app/modules/time-clock/services/entry.service.ts b/src/app/modules/time-clock/services/entry.service.ts
index 939f94c79..238a2b2e4 100644
--- a/src/app/modules/time-clock/services/entry.service.ts
+++ b/src/app/modules/time-clock/services/entry.service.ts
@@ -68,7 +68,7 @@ export class EntryService {
     return this.http.get<Entry[]>(findEntriesByProjectURL);
   }
 
-  loadEntriesByTimeRange(range: TimeEntriesTimeRange, userId: string): Observable<any> {
+  loadEntriesByTimeRange(range: TimeEntriesTimeRange, userId: string[]): Observable<any> {
     const MAX_NUMBER_OF_ENTRIES_FOR_REPORTS = 9999;
     const loadEntriesByTimeRangeURL = this.urlInProductionLegacy ? this.baseUrl : this.baseUrl + '/report/';
     return this.http.get(loadEntriesByTimeRangeURL,