diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/base-edit-task-filter-cloud.component.html b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/base-edit-task-filter-cloud.component.html
index 12d4b611d1..3e6be5a3ce 100644
--- a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/base-edit-task-filter-cloud.component.html
+++ b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/base-edit-task-filter-cloud.component.html
@@ -102,7 +102,7 @@
                                                      (dateChanged)="onDateRangeFilterChanged($event, taskFilterProperty)">
                         </adf-cloud-date-range-filter>
 
-                        <div fxFlex="23%" class="adf-edit-task-filter-checkbox" *ngIf="isUserSelectType(taskFilterProperty)">
+                        <div fxFlex="23%" class="{{ 'adf-edit-task-filter-' + taskFilterProperty.key }}" *ngIf="isUserSelectType(taskFilterProperty)">
                             <adf-cloud-people
                                 [preSelectUsers]="taskFilterProperty.value"
                                 [title]="taskFilterProperty.label"
diff --git a/lib/testing/src/lib/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts b/lib/testing/src/lib/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts
index 3f30900559..e16a8af774 100644
--- a/lib/testing/src/lib/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts
+++ b/lib/testing/src/lib/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts
@@ -21,6 +21,7 @@ import { BrowserVisibility } from '../../core/utils/browser-visibility';
 import { BrowserActions } from '../../core/utils/browser-actions';
 import { DropdownPage } from '../../core/pages/material/dropdown.page';
 import { DataTableComponentPage } from '../../core/pages/data-table-component.page';
+import { PeopleCloudComponentPage } from './people-cloud-component.page';
 
 export class EditTaskFilterCloudComponentPage {
 
@@ -53,6 +54,7 @@ export class EditTaskFilterCloudComponentPage {
     completedDateDropdown = new DropdownPage(this.locatorCompletedDateDropdown);
 
     editTaskFilterDialogPage = new EditTaskFilterDialogPage();
+    peopleCloudComponent = new PeopleCloudComponentPage();
 
     dataTable = new DataTableComponentPage( element(by.css('adf-cloud-task-list')));
 
@@ -110,7 +112,7 @@ export class EditTaskFilterCloudComponentPage {
     }
 
     async setCompletedBy(option: string): Promise<void> {
-        await this.setProperty('completedBy', option);
+        await this.peopleCloudComponent.searchAssigneeAndSelect(option);
     }
 
     async setPriority(option): Promise<void> {