diff --git a/ng2-components/ng2-alfresco-core/src/services/user-preferences.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/user-preferences.service.spec.ts
index 03f39e0fcd..378867b5ce 100644
--- a/ng2-components/ng2-alfresco-core/src/services/user-preferences.service.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/user-preferences.service.spec.ts
@@ -61,6 +61,7 @@ describe('UserPreferencesService', () => {
     });
 
     it('should format property key for default prefix', () => {
+        preferences.setStoragePrefix(null);
         expect(preferences.getPropertyKey('propertyA')).toBe('GUEST__propertyA');
     });
 
diff --git a/ng2-components/ng2-alfresco-core/src/services/user-preferences.service.ts b/ng2-components/ng2-alfresco-core/src/services/user-preferences.service.ts
index 3719eb86eb..0a992085de 100644
--- a/ng2-components/ng2-alfresco-core/src/services/user-preferences.service.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/user-preferences.service.ts
@@ -26,14 +26,12 @@ export class UserPreferencesService {
         paginationSize: 25
     };
 
-    private _storagePrefix: string = 'GUEST';
-
     getStoragePrefix(): string {
-        return this._storagePrefix;
+        return this.storage.getItem('USER_PROFILE') || 'GUEST';
     }
 
     setStoragePrefix(value: string) {
-        this._storagePrefix = value || 'GUEST';
+        this.storage.setItem('USER_PROFILE', value || 'GUEST');
     }
 
     constructor(