diff --git a/demo-shell/src/app/components/settings/host-settings.component.html b/demo-shell/src/app/components/settings/host-settings.component.html
index 74162f4cef..b820b6ac92 100644
--- a/demo-shell/src/app/components/settings/host-settings.component.html
+++ b/demo-shell/src/app/components/settings/host-settings.component.html
@@ -85,7 +85,7 @@
                     <mat-slide-toggle class="adf-full-width" name="implicitFlow" formControlName="implicitFlow">
                     </mat-slide-toggle>
 
-                    <ng-container *ngIf="supportsCodeFlow">
+                    <ng-container *ngIf="isOAUTH">
                         <mat-label>Code Flow</mat-label>
                         <mat-slide-toggle class="adf-full-width" name="codeFlow" formControlName="codeFlow">
                         </mat-slide-toggle>
diff --git a/lib/process-services-cloud/src/lib/task/task-filters/services/task-filter-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/task/task-filters/services/task-filter-cloud.service.spec.ts
index 2cb410d623..e6b39a21d6 100644
--- a/lib/process-services-cloud/src/lib/task/task-filters/services/task-filter-cloud.service.spec.ts
+++ b/lib/process-services-cloud/src/lib/task/task-filters/services/task-filter-cloud.service.spec.ts
@@ -37,6 +37,7 @@ import { TaskCloudEngineEvent } from './../../../models/engine-event-cloud.model
 import { ProcessServiceCloudTestingModule } from '../../../testing/process-service-cloud.testing.module';
 import { IdentityUserService } from '../../../people/services/identity-user.service';
 import { ApolloModule } from 'apollo-angular';
+import { StorageService } from '@alfresco/adf-core';
 
 describe('TaskFilterCloudService', () => {
     let service: TaskFilterCloudService;
@@ -227,6 +228,7 @@ describe('Inject [LocalPreferenceCloudService] into the TaskFilterCloudService',
     let preferenceCloudService: PreferenceCloudServiceInterface;
     let identityUserService: IdentityUserService;
     let getPreferencesSpy: jasmine.Spy;
+    let storageService: StorageService;
 
     const identityUserMock = { username: 'fakeusername', firstName: 'fake-identity-first-name', lastName: 'fake-identity-last-name', email: 'fakeIdentity@email.com' };
 
@@ -240,6 +242,7 @@ describe('Inject [LocalPreferenceCloudService] into the TaskFilterCloudService',
         service = TestBed.inject(TaskFilterCloudService);
         preferenceCloudService = service.preferenceService;
         identityUserService = TestBed.inject(IdentityUserService);
+        storageService = TestBed.inject(StorageService);
         getPreferencesSpy = spyOn(preferenceCloudService, 'getPreferences').and.returnValue(of([]));
         spyOn(identityUserService, 'getCurrentUserInfo').and.returnValue(identityUserMock);
     });
@@ -270,7 +273,7 @@ describe('Inject [LocalPreferenceCloudService] into the TaskFilterCloudService',
         });
         expect(getPreferencesSpy).toHaveBeenCalled();
 
-        const localData = JSON.parse(localStorage.getItem(`task-filters-${appName}-${identityUserMock.username}`));
+        const localData = JSON.parse(storageService.getItem(`task-filters-${appName}-${identityUserMock.username}`));
         expect(localData.length).toEqual(3);
 
         expect(localData[0].name).toEqual('ADF_CLOUD_TASK_FILTERS.MY_TASKS');