diff --git a/e2e/pages/adf/settingsPage.ts b/e2e/pages/adf/settingsPage.ts
index 3d489e10d9..1f46b5720e 100644
--- a/e2e/pages/adf/settingsPage.ts
+++ b/e2e/pages/adf/settingsPage.ts
@@ -42,6 +42,7 @@ export class SettingsPage {
     selectedOption = element(by.css('span[class*="mat-select-value-text"]'));
     ecmText = element(by.css('input[data-automation-id*="ecmHost"]'));
     bpmText = element(by.css('input[data-automation-id*="bpmHost"]'));
+    clientIdText = element(by.css('input[id="clientId"]'));
     authHostText = element(by.css('input[id="oauthHost"]'));
     ssoRadioButton = element(by.cssContainingText('mat-radio-button[id*="mat-radio"]', 'SSO'));
     basicAuthRadioButton = element(by.cssContainingText('mat-radio-button[id*="mat-radio"]', 'Basic Authentication'));
@@ -144,6 +145,7 @@ export class SettingsPage {
         Util.waitUntilElementIsVisible(this.bpmText);
         Util.waitUntilElementIsNotOnPage(this.ecmText);
         await this.clickSsoRadioButton();
+        await this.setClientId();
         await this.setProcessServicesURL(processServiceURL);
         await this.setAuthHost(authHost);
         await this.setSilentLogin(silentLogin);
@@ -157,6 +159,12 @@ export class SettingsPage {
         this.bpmText.sendKeys(processServiceURL);
     }
 
+    async setClientId () {
+        Util.waitUntilElementIsVisible(this.clientIdText);
+        this.clientIdText.clear();
+        this.clientIdText.sendKeys(TestConfig.adf_aps.clientIdSso);
+    }
+
     async setContentServicesURL (contentServiceURL) {
         Util.waitUntilElementIsClickable(this.ecmText);
         this.ecmText.clear();
diff --git a/e2e/process-services-cloud/tasks-custom-filters.e2e.ts b/e2e/process-services-cloud/tasks-custom-filters.e2e.ts
index 59fa15be77..28e0b214ee 100644
--- a/e2e/process-services-cloud/tasks-custom-filters.e2e.ts
+++ b/e2e/process-services-cloud/tasks-custom-filters.e2e.ts
@@ -128,9 +128,10 @@ describe('Task filters cloud', () => {
             tasksCloudDemoPage.taskListCloudComponent().getDataTable().checkSpinnerIsDisplayed();
             tasksCloudDemoPage.taskListCloudComponent().getDataTable().checkSpinnerIsNotDisplayed();
             tasksCloudDemoPage.taskListCloudComponent().getDataTable().getAllRowsNameColumn().then( (list) => {
-
                 let initialList = list.slice(0);
-                list.sort();
+                list.sort(function (firstStr, secondStr) {
+                    return firstStr.localeCompare(secondStr);
+                });
                 expect(JSON.stringify(initialList) === JSON.stringify(list)).toEqual(true);
             });
 
@@ -139,7 +140,9 @@ describe('Task filters cloud', () => {
             tasksCloudDemoPage.taskListCloudComponent().getDataTable().checkSpinnerIsNotDisplayed();
             tasksCloudDemoPage.taskListCloudComponent().getDataTable().getAllRowsNameColumn().then( (list) => {
                 let initialList = list.slice(0);
-                list.sort();
+                list.sort(function (firstStr, secondStr) {
+                    return firstStr.localeCompare(secondStr);
+                });
                 list.reverse();
                 expect(JSON.stringify(initialList) === JSON.stringify(list)).toEqual(true);
             });
diff --git a/e2e/test.config.js b/e2e/test.config.js
index b4b2109874..10c17cad6e 100644
--- a/e2e/test.config.js
+++ b/e2e/test.config.js
@@ -82,6 +82,8 @@ module.exports = {
          * @config adf.ACSAPIContextRoot {String}


          */
         apiContextRoot: "/alfresco/api/-default-/public",
+
+        clientIdSso: "alfresco",
     },
 
     adf_aps: {
@@ -107,7 +109,9 @@ module.exports = {
          * The BPM API context required for calls


          * @config adf.APSAPIContextRoot {String}


          */
-        apiContextRoot: "/activiti-app"
+        apiContextRoot: "/activiti-app",
+
+        clientIdSso: "activiti",
     }
 
 };