diff --git a/ng2-components/ng2-alfresco-userinfo/karma.conf.js b/ng2-components/ng2-alfresco-userinfo/karma.conf.js
index 8f3adc54b4..2b805693c3 100644
--- a/ng2-components/ng2-alfresco-userinfo/karma.conf.js
+++ b/ng2-components/ng2-alfresco-userinfo/karma.conf.js
@@ -45,6 +45,10 @@ module.exports = function (config) {
 
       // ng2-components
       { pattern: 'node_modules/ng2-alfresco-core/dist/**/*.js', included: false, served: true, watched: false },
+      // Fake files
+      { pattern: 'src/assets/ecmImg.gif', included: false, watched: true, served: true },
+      { pattern: 'src/assets/bpmImg.gif', included: false, watched: true, served: true },
+      { pattern: 'src/img/anonymous.gif', included: false, watched: true, served: true },
 
       // paths to support debugging with source maps in dev tools
       {pattern: 'src/**/*.ts', included: false, watched: false},
diff --git a/ng2-components/ng2-alfresco-userinfo/src/assets/anonymous.gif b/ng2-components/ng2-alfresco-userinfo/src/assets/anonymous.gif
new file mode 100644
index 0000000000..e1b58fa57d
Binary files /dev/null and b/ng2-components/ng2-alfresco-userinfo/src/assets/anonymous.gif differ
diff --git a/ng2-components/ng2-alfresco-userinfo/src/assets/bpmImg.gif b/ng2-components/ng2-alfresco-userinfo/src/assets/bpmImg.gif
new file mode 100644
index 0000000000..e1b58fa57d
Binary files /dev/null and b/ng2-components/ng2-alfresco-userinfo/src/assets/bpmImg.gif differ
diff --git a/ng2-components/ng2-alfresco-userinfo/src/assets/ecmImg.gif b/ng2-components/ng2-alfresco-userinfo/src/assets/ecmImg.gif
new file mode 100644
index 0000000000..e1b58fa57d
Binary files /dev/null and b/ng2-components/ng2-alfresco-userinfo/src/assets/ecmImg.gif differ
diff --git a/ng2-components/ng2-alfresco-userinfo/src/assets/fake-bpm-user.service.mock.ts b/ng2-components/ng2-alfresco-userinfo/src/assets/fake-bpm-user.service.mock.ts
index ffddf85e68..eae63e6272 100644
--- a/ng2-components/ng2-alfresco-userinfo/src/assets/fake-bpm-user.service.mock.ts
+++ b/ng2-components/ng2-alfresco-userinfo/src/assets/fake-bpm-user.service.mock.ts
@@ -60,7 +60,30 @@ export var fakeBpmUser: BpmUserModel = {
     lastUpdate: 'fake-update-date',
     latestSyncTimeStamp: 'fake-timestamp',
     password: 'fake-password',
-    pictureId: 'fake-picture-id',
+    pictureId: 'src/assets/bpmImg.gif',
+    status: 'fake-status',
+    tenantId: 'fake-tenant-id',
+    tenantName: 'fake-tenant-name',
+    tenantPictureId: 'fake-tenant-picture-id',
+    type: 'fake-type'
+};
+
+export var fakeBpmEditedUser: BpmUserModel = {
+    apps: {},
+    capabilities: 'fake-capability',
+    company: 'fake-company',
+    created: 'fake-create-date',
+    email: 'fakeBpm@fake.com',
+    externalId: 'fake-external-id',
+    firstName: 'fake-first-name',
+    lastName: 'fake-last-name',
+    fullname: 'fake-full-name',
+    groups: {},
+    id: 'fake-id',
+    lastUpdate: 'fake-update-date',
+    latestSyncTimeStamp: 'fake-timestamp',
+    password: 'fake-password',
+    pictureId: 'src/assets/bpmImg.gif',
     status: 'fake-status',
     tenantId: 'fake-tenant-id',
     tenantName: 'fake-tenant-name',
@@ -70,27 +93,31 @@ export var fakeBpmUser: BpmUserModel = {
 
 export class FakeBpmUserService {
 
-  lastPromise: Observable<BpmUserModel>;
-  public userNeeded = 0;
-  usersList = [fakeBpmUser, fakeBpmUserNoImage];
+    lastPromise: Observable<BpmUserModel>;
+    public userNeeded = 0;
+    usersList = [fakeBpmUser, fakeBpmUserNoImage, fakeBpmEditedUser];
 
-  getUserInfo(userName: string) {
-    return this.lastPromise = Observable.of(this.usersList[this.userNeeded]);
-  };
+    getUserInfo(userName: string) {
+        return this.lastPromise = Observable.of(this.usersList[this.userNeeded]);
+    };
 
-  getCurrentUserInfo() {
-    return this.getUserInfo('fake-id');
-  };
+    getCurrentUserInfo() {
+        return this.getUserInfo('fake-id');
+    };
 
-  getCurrentUserProfileImage() {
-      return Observable.of(this.usersList[this.userNeeded].pictureId);
-  };
+    getCurrentUserProfileImage() {
+        return Observable.of(this.usersList[this.userNeeded].pictureId);
+    };
 
-  respondWithTheUserWithoutImage() {
-    this.userNeeded = 1;
-  }
+    respondWithTheUserWithoutImage() {
+        this.userNeeded = 1;
+    }
 
-  respondWithTheUserWithImage() {
-    this.userNeeded = 0;
-  }
+    respondWithTheUserWithImage() {
+        this.userNeeded = 0;
+    }
+
+    respondWithEditedUser() {
+        this.userNeeded = 2;
+    }
 }
diff --git a/ng2-components/ng2-alfresco-userinfo/src/assets/fake-ecm-user.service.mock.ts b/ng2-components/ng2-alfresco-userinfo/src/assets/fake-ecm-user.service.mock.ts
index 9024896f7b..c2d7a9d040 100644
--- a/ng2-components/ng2-alfresco-userinfo/src/assets/fake-ecm-user.service.mock.ts
+++ b/ng2-components/ng2-alfresco-userinfo/src/assets/fake-ecm-user.service.mock.ts
@@ -76,11 +76,32 @@ export var fakeEcmUser: EcmUserModel = {
     emailNotificationsEnabled: true
 };
 
+export var fakeEcmEditedUser: EcmUserModel = {
+    id: 'fake-id',
+    firstName: 'fake-first-name',
+    lastName: 'fake-last-name',
+    description: 'i am a fake user for test',
+    avatarId: 'fake-avatar-id',
+    email: 'fakeEcm@ecmUser.com',
+    skypeId: 'fake-skype-id',
+    googleId: 'fake-googleId-id',
+    instantMessageId: 'fake-instantMessageId-id',
+    company: fakeEcmCompany,
+    jobTitle: 'test job',
+    location: 'fake location',
+    mobile: '000000000',
+    telephone: '11111111',
+    statusUpdatedAt: 'fake-date',
+    userStatus: 'active',
+    enabled: true,
+    emailNotificationsEnabled: true
+};
+
 export class FakeEcmUserService {
 
     lastPromise: Observable<EcmUserModel>;
     public userNeeded = 0;
-    usersList = [fakeEcmUser, fakeEcmUserNoImage];
+    usersList = [fakeEcmUser, fakeEcmUserNoImage, fakeEcmEditedUser];
 
     getUserInfo(userName: string) {
         return this.lastPromise = Observable.of(this.usersList[this.userNeeded]);
@@ -92,7 +113,7 @@ export class FakeEcmUserService {
 
     getUserProfileImage(avatarId: string) {
         if (avatarId) {
-            return 'fake/url/image/for/ecm/user';
+            return 'src/assets/ecmImg.gif';
         }
     };
 
@@ -104,4 +125,8 @@ export class FakeEcmUserService {
         this.userNeeded = 0;
     };
 
+    respondWithEditedUser() {
+        this.userNeeded = 2;
+    };
+
 }
diff --git a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html
index 04b7db4e95..a5cccc1539 100644
--- a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html
+++ b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.html
@@ -1,56 +1,58 @@
-<div id="img_container">
-    <span *ngIf="ecmUser">{{ecmUser.firstName || ecmUser.lastName}}</span>
-    <span *ngIf="bpmUser && !ecmUser">
+<div id="userinfo_container">
+    <span id="ecm_username" *ngIf="ecmUser">{{ecmUser.firstName || ecmUser.lastName}}</span>
+    <span id="bpm_username" *ngIf="bpmUser && !ecmUser">
         {{ formatValue(bpmUser.firstName) ||
            formatValue(bpmUser.lastName)  ||
-           formatValue(bpmUser.fullName) }}
+           formatValue(bpmUser.fullname) }}
     </span>
-    <div class="button-profile" id="user-profile" data-automation-id="user-profile">
+    <div *ngIf="ecmUser || bpmUser" class="button-profile" id="user-profile" data-automation-id="user-profile">
                 <img id="logged-user-img"
                      [src]="getUserAvatar()"
                      class="profile-image"/>
     </div>
-    <div class="user-profile-list-mdl
+    <div *ngIf="ecmUser || bpmUser" id="user-profile-lists" class="user-profile-list-mdl
                 mdl-menu mdl-menu--bottom-right
                 mdl-js-menu mdl-js-ripple-effect"
                 for="user-profile">
             <ul class='detail-user-profile-list-mdl mdl-list'>
-                <div *ngIf="ecmUser">
+                <div id="ecm-user-detail" *ngIf="ecmUser">
                     <hr class="title-start">
-                    <span class="header-profile"><b>ECM</b></span>
+                    <span id="ecm_title" class="header-profile"><b>ECM</b></span>
                     <li class="mdl-list__item mdl-list__item--two-line">
                         <span class="mdl-list__item-primary-content">
                           <i class="mdl-list__item-avatar">
-                              <img id="logged-user-img"
+                              <img id="ecm-user-detail-image"
                                    [src]="getEcmUserAvatar()"
                                    class="profile-image"/>
                           </i>
-                          <span class="truncate-long-names">{{ecmUser.firstName}} {{ecmUser.lastName}}</span>
-                          <span class="mdl-list__item-sub-title">{{ecmUser.email}}</span>
+                          <span id="ecm-full-name" class="truncate-long-names">
+                              {{ecmUser.firstName}} {{ecmUser.lastName}}
+                          </span>
+                          <span  id="ecm-email" class="mdl-list__item-sub-title">{{ecmUser.email}}</span>
                         </span>
-                        <span class="mdl-list__item-secondary-content custom-role-style">
+                        <span id="ecm-job-title" class="mdl-list__item-secondary-content custom-role-style">
                             <span class="role-label-user">Job Role</span>
                             {{ ecmUser.jobTitle ? ecmUser.jobTitle : 'N/A' }}
                         </span>
                     </li>
                     <br>
                 </div>
-                <div *ngIf="bpmUser">
+                <div id="bpm-user-detail" *ngIf="bpmUser">
                     <hr class="title-start">
-                    <span class="header-profile"><b>BPM</b></span>
+                    <span  id="bpm_title" class="header-profile"><b>BPM</b></span>
                     <li class="mdl-list__item mdl-list__item--two-line">
                         <span class="mdl-list__item-primary-content">
                           <i class="mdl-list__item-avatar">
-                              <img id="logged-user-img"
+                              <img id="bpm-user-detail-image"
                                    [src]="getBpmUserAvatar()"
                                    class="profile-image"/>
                           </i>
-                          <span class="truncate-long-names">
-                              {{formatValue(bpmUser.firstName) }} {{ formatValue(bpmUser.lastName) }}
+                          <span  id="bpm-full-name" class="truncate-long-names">
+                              {{ formatValue(bpmUser.firstName) }} {{ formatValue(bpmUser.lastName) }}
                           </span>
-                          <span class="mdl-list__item-sub-title">{{bpmUser.email}}</span>
+                          <span id="bpm-email" class="mdl-list__item-sub-title">{{bpmUser.email}}</span>
                         </span>
-                        <span class="mdl-list__item-secondary-content custom-role-style">
+                        <span  id="bpm-tenant" class="mdl-list__item-secondary-content custom-role-style">
                             <span class="role-label-user">Tenant</span>
                             {{bpmUser.tenantName}}
                         </span>
diff --git a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.spec.ts b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.spec.ts
index 58fa3d5c1d..5c1e383faf 100644
--- a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.spec.ts
+++ b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.spec.ts
@@ -19,74 +19,65 @@ import { UserInfoComponent } from './user-info.component';
 import { EcmUserService } from '../services/ecm-user.service';
 import { BpmUserService } from '../services/bpm-user.service';
 import { FakeEcmUserService } from '../assets/fake-ecm-user.service.mock';
+import { fakeEcmEditedUser } from '../assets/fake-ecm-user.service.mock';
 import { FakeBpmUserService } from '../assets/fake-bpm-user.service.mock';
-import { AlfrescoAuthenticationService, AlfrescoContentService } from 'ng2-alfresco-core';
+import { fakeBpmEditedUser } from '../assets/fake-bpm-user.service.mock';
+import { AlfrescoContentService, AlfrescoSettingsService } from 'ng2-alfresco-core';
 import { ComponentFixture, TestBed, async } from '@angular/core/testing';
 
-class StubAuthentication {
-    isEcmConnected: boolean;
-    isBpmConnected: boolean;
+class StubSetting {
+    provider: string;
 
-    setIsEcmLoggedIn(logged: boolean) {
-        this.isEcmConnected = logged;
+    setProviders(provider: string) {
+        this.provider = provider;
     };
 
-    setIsBpmLoggedIn(logged: boolean) {
-        this.isBpmConnected = logged;
-    };
-
-    isEcmLoggedIn() {
-        return this.isEcmConnected;
-    };
-
-    isBpmLoggedIn() {
-        return this.isBpmConnected;
+    getProviders() {
+        return this.provider;
     };
 }
 
 class StubAlfrescoContentService {
     getContentUrl() {
         return 'fake/url/image/for/ecm/user';
-    } ;
+    };
 }
 
 describe('User info component', () => {
 
     let userInfoComp: UserInfoComponent;
     let fixture: ComponentFixture<UserInfoComponent>;
-    let authStub: StubAuthentication;
+    let stubSetting: StubSetting;
     let fakeEcmService: FakeEcmUserService;
     let fakeBpmService: FakeBpmUserService;
+    let element: HTMLElement;
 
     beforeEach(async(() => {
         TestBed.configureTestingModule({
             declarations: [UserInfoComponent],
             providers: [{provide: EcmUserService, useClass: FakeEcmUserService},
                 {provide: BpmUserService, useClass: FakeBpmUserService},
-                {provide: AlfrescoAuthenticationService, useClass: StubAuthentication},
+                {provide: AlfrescoSettingsService, useClass: StubSetting},
                 {provide: AlfrescoContentService, useClass: StubAlfrescoContentService}
             ]
         }).compileComponents().then(() => {
             fixture = TestBed.createComponent(UserInfoComponent);
             userInfoComp = fixture.componentInstance;
+            element = fixture.nativeElement;
         });
     }));
 
-    it('should NOT have users before ngOnInit only anonymous image', () => {
-        expect(userInfoComp.ecmUser).toBeUndefined();
-        expect(userInfoComp.ecmUserImage).toBeUndefined();
-        expect(userInfoComp.bpmUser).toBeUndefined();
-        expect(userInfoComp.bpmUserImage).toBeUndefined();
-        expect(userInfoComp.anonymouseImageUrl).toBeDefined();
+    it('should not show any image if the user is not logged in', () => {
+        expect(element.querySelector('#userinfo_container')).toBeDefined();
+        expect(element.querySelector('#logged-user-img')).toBeNull();
     });
 
     it('should NOT have users immediately after ngOnInit', () => {
         fixture.detectChanges();
-        expect(userInfoComp.ecmUser).toBeUndefined();
-        expect(userInfoComp.ecmUserImage).toBeUndefined();
-        expect(userInfoComp.bpmUser).toBeUndefined();
-        expect(userInfoComp.bpmUserImage).toBeUndefined();
-        expect(userInfoComp.anonymouseImageUrl).toBeDefined();
+        expect(element.querySelector('#userinfo_container')).toBeDefined();
+        expect(element.querySelector('#ecm_username')).toBeNull();
+        expect(element.querySelector('#bpm_username')).toBeNull();
+        expect(element.querySelector('#user-profile-lists')).toBeNull();
     });
 
     it('should format null string values in null value', () => {
@@ -107,11 +98,11 @@ describe('User info component', () => {
     describe('when user is logged on ecm', () => {
 
         beforeEach(async(() => {
-            authStub = fixture.debugElement.injector.get(AlfrescoAuthenticationService);
+            stubSetting = fixture.debugElement.injector.get(AlfrescoSettingsService);
             fakeEcmService = fixture.debugElement.injector.get(EcmUserService);
 
-            authStub.setIsEcmLoggedIn(true);
-            fixture.detectChanges(); // runs ngOnInit -> getUsers
+            stubSetting.setProviders('ECM');
+            fixture.detectChanges();
             fixture.whenStable()
                 .then(() => {
                     fixture.detectChanges();
@@ -119,38 +110,56 @@ describe('User info component', () => {
         }));
 
         it('should get the ecm current user image from the service', () => {
-            expect(userInfoComp.ecmUser).toBeDefined();
-            expect(userInfoComp.ecmUserImage).toBeDefined();
-            expect(userInfoComp.ecmUserImage).toEqual('fake/url/image/for/ecm/user');
+            expect(element.querySelector('#userinfo_container')).toBeDefined();
+            expect(element.querySelector('#logged-user-img')).toBeDefined();
+            expect(element.querySelector('#logged-user-img').getAttribute('src')).toEqual('src/assets/ecmImg.gif');
         });
 
         it('should get the ecm user informations from the service', () => {
-            expect(userInfoComp.ecmUser).toBeDefined();
-            expect(userInfoComp.ecmUser.firstName).toEqual('fake-first-name');
-            expect(userInfoComp.ecmUser.lastName).toEqual('fake-last-name');
+            expect(element.querySelector('#userinfo_container')).toBeDefined();
+            expect(element.querySelector('#ecm_username')).toBeDefined();
+            expect(element.querySelector('#ecm_title')).toBeDefined();
+            expect(element.querySelector('#ecm-user-detail-image')).toBeDefined();
+            expect(element.querySelector('#ecm-user-detail-image').getAttribute('src')).toEqual('src/assets/ecmImg.gif');
+            expect(element.querySelector('#ecm-full-name').innerHTML).toContain('fake-first-name fake-last-name');
+            expect(element.querySelector('#ecm-job-title').innerHTML).toContain('test job');
         });
 
-        it('should return the anonynous user avatar image url when user does not have avatarId', async(() => {
+        it('should return the anonymous user avatar image url when user does not have avatarId', () => {
             fakeEcmService.respondWithTheUserWithoutImage();
             userInfoComp.ngOnInit();
             fixture.whenStable()
                 .then(() => {
                     fixture.detectChanges();
                     let res = userInfoComp.getEcmUserAvatar();
-                    expect(userInfoComp.ecmUserImage).toBeUndefined();
-                    expect(res).toEqual(userInfoComp.anonymouseImageUrl);
+                    expect(res).toBeDefined();
+                    expect(element.querySelector('#logged-user-img').getAttribute('src'))
+                        .toContain('src/img/anonymous.gif');
                 });
-        }));
+        });
+
+        it('should show N/A when the job title is null', () => {
+            fakeEcmEditedUser.jobTitle = null;
+            fakeEcmService.respondWithEditedUser();
+            userInfoComp.ngOnInit();
+            fixture.whenStable()
+                .then(() => {
+                    fixture.detectChanges();
+                    expect(element.querySelector('#userinfo_container')).toBeDefined();
+                    expect(element.querySelector('#ecm-job-title')).toBeDefined();
+                    expect(element.querySelector('#ecm-job-title').innerHTML).toContain('N/A');
+                });
+        });
     });
 
     describe('when user is logged on bpm', () => {
 
         beforeEach(async(() => {
-            authStub = fixture.debugElement.injector.get(AlfrescoAuthenticationService);
+            stubSetting = fixture.debugElement.injector.get(AlfrescoSettingsService);
             fakeBpmService = fixture.debugElement.injector.get(BpmUserService);
 
-            authStub.setIsBpmLoggedIn(true);
-            fixture.detectChanges(); // runs ngOnInit -> getUsers
+            stubSetting.setProviders('BPM');
+            fixture.detectChanges();
             fixture.whenStable()
                 .then(() => {
                     fixture.detectChanges();
@@ -158,81 +167,143 @@ describe('User info component', () => {
         }));
 
         it('should get the bpm current user image from the service', () => {
-            expect(userInfoComp.bpmUser).toBeDefined();
-            expect(userInfoComp.bpmUserImage).toBeDefined();
-            expect(userInfoComp.bpmUserImage).toEqual('fake-picture-id');
+            expect(element.querySelector('#userinfo_container')).toBeDefined();
+            expect(element.querySelector('#logged-user-img')).toBeDefined();
+            expect(element.querySelector('#logged-user-img').getAttribute('src')).toEqual('src/assets/bpmImg.gif');
+        });
+
+        it('should show last name if first name is null', () => {
+            fakeBpmEditedUser.firstName = null;
+            fakeBpmService.respondWithEditedUser();
+            userInfoComp.ngOnInit();
+            fixture.whenStable()
+                .then(() => {
+                    fixture.detectChanges();
+                    expect(element.querySelector('#userinfo_container')).toBeDefined();
+                    expect(element.querySelector('#bpm_username')).toBeDefined();
+                    expect(element.querySelector('#bpm_username').innerHTML).toContain('fake-last-name');
+                });
+        });
+
+        it('should show full name if first and last name are null', () => {
+            fakeBpmEditedUser.firstName = null;
+            fakeBpmEditedUser.lastName = null;
+            fakeBpmService.respondWithEditedUser();
+            userInfoComp.ngOnInit();
+            fixture.whenStable()
+                .then(() => {
+                    fixture.detectChanges();
+                    expect(element.querySelector('#userinfo_container')).toBeDefined();
+                    expect(element.querySelector('#bpm_username')).toBeDefined();
+                    expect(element.querySelector('#bpm_username').innerHTML).toContain('fake-full-name');
+                });
+        });
+
+        it('should not show first name if it is null string', () => {
+            fakeBpmEditedUser.firstName = 'null';
+            fakeBpmEditedUser.lastName = 'fake-last-name';
+            fakeBpmService.respondWithEditedUser();
+            userInfoComp.ngOnInit();
+            fixture.whenStable()
+                .then(() => {
+                    fixture.detectChanges();
+                    expect(element.querySelector('#userinfo_container')).toBeDefined();
+                    expect(element.querySelector('#bpm-full-name')).toBeDefined();
+                    expect(element.querySelector('#bpm-full-name').innerHTML).not.toContain('fake-first-name');
+                    expect(element.querySelector('#bpm-full-name').innerHTML).toContain('fake-last-name');
+                });
+        });
+
+        it('should not show last name if it is null string', () => {
+            fakeBpmEditedUser.lastName = 'null';
+            fakeBpmEditedUser.firstName = 'fake-first-name';
+            fakeBpmService.respondWithEditedUser();
+            userInfoComp.ngOnInit();
+            fixture.whenStable()
+                .then(() => {
+                    fixture.detectChanges();
+                    expect(element.querySelector('#userinfo_container')).toBeDefined();
+                    expect(element.querySelector('#bpm-full-name')).toBeDefined();
+                    expect(element.querySelector('#bpm-full-name').innerHTML).toContain('fake-first-name');
+                    expect(element.querySelector('#bpm-full-name').innerHTML).not.toContain('fake-last-name');
+                });
         });
 
         it('should get the bpm user informations from the service', () => {
-            expect(userInfoComp.bpmUser).toBeDefined();
-            expect(userInfoComp.bpmUser.firstName).toEqual('fake-first-name');
-            expect(userInfoComp.bpmUser.lastName).toEqual('fake-last-name');
+            expect(element.querySelector('#userinfo_container')).toBeDefined();
+            expect(element.querySelector('#bpm_username')).toBeDefined();
+            expect(element.querySelector('#bpm_title')).toBeDefined();
+            expect(element.querySelector('#bpm-user-detail-image')).toBeDefined();
+            expect(element.querySelector('#bpm-user-detail-image').getAttribute('src')).toEqual('src/assets/bpmImg.gif');
+            expect(element.querySelector('#bpm-full-name').innerHTML).toContain('fake-first-name fake-last-name');
+            expect(element.querySelector('#bpm-tenant').innerHTML).toContain('fake-tenant-name');
         });
 
-        it('should return the anonynous user avatar image url when user does not have avatarId', async(() => {
+        it('should return the anonymous user avatar image url when user does not have avatarId', () => {
             fakeBpmService.respondWithTheUserWithoutImage();
             userInfoComp.ngOnInit();
             fixture.whenStable()
                 .then(() => {
                     fixture.detectChanges();
                     let res = userInfoComp.getBpmUserAvatar();
-                    expect(userInfoComp.bpmUserImage).toBeUndefined();
-                    expect(res).toEqual(userInfoComp.anonymouseImageUrl);
+                    expect(res).toBeDefined();
+                    expect(element.querySelector('#logged-user-img').getAttribute('src'))
+                        .toContain('src/img/anonymous.gif');
                 });
-        }));
+        });
     });
 
     describe('when user is logged on bpm and ecm', () => {
 
         beforeEach(async(() => {
-            authStub = fixture.debugElement.injector.get(AlfrescoAuthenticationService);
+            stubSetting = fixture.debugElement.injector.get(AlfrescoSettingsService);
             fakeBpmService = fixture.debugElement.injector.get(BpmUserService);
             fakeEcmService = fixture.debugElement.injector.get(EcmUserService);
 
-            authStub.setIsBpmLoggedIn(true);
-            authStub.setIsEcmLoggedIn(true);
-            fixture.detectChanges(); // runs ngOnInit -> getUsers
+            stubSetting.setProviders('ALL');
+            fixture.detectChanges();
             fixture.whenStable()
                 .then(() => {
                     fixture.detectChanges();
                 });
         }));
 
-        it('should get the bpm current user image from the service', () => {
-            expect(userInfoComp.bpmUser).toBeDefined();
-            expect(userInfoComp.bpmUserImage).toBeDefined();
-            expect(userInfoComp.bpmUserImage).toEqual('fake-picture-id');
-            expect(userInfoComp.ecmUser).toBeDefined();
-            expect(userInfoComp.ecmUserImage).toBeDefined();
-            expect(userInfoComp.ecmUserImage).toEqual('fake/url/image/for/ecm/user');
-        });
-
         it('should get the bpm user informations from the service', () => {
-            expect(userInfoComp.bpmUser).toBeDefined();
-            expect(userInfoComp.bpmUser.firstName).toEqual('fake-first-name');
-            expect(userInfoComp.bpmUser.lastName).toEqual('fake-last-name');
-            expect(userInfoComp.ecmUser).toBeDefined();
-            expect(userInfoComp.ecmUser.firstName).toEqual('fake-first-name');
-            expect(userInfoComp.ecmUser.lastName).toEqual('fake-last-name');
+            expect(element.querySelector('#userinfo_container')).toBeDefined();
+            expect(element.querySelector('#bpm_username')).toBeDefined();
+            expect(element.querySelector('#bpm_title')).toBeDefined();
+            expect(element.querySelector('#bpm-user-detail-image')).toBeDefined();
+            expect(element.querySelector('#bpm-user-detail-image').getAttribute('src')).toEqual('src/assets/bpmImg.gif');
+            expect(element.querySelector('#bpm-full-name').innerHTML).toContain('fake-first-name fake-last-name');
+            expect(element.querySelector('#bpm-tenant').innerHTML).toContain('fake-tenant-name');
         });
 
-        it('should return the anonynous user avatar image url when user does not have avatarId', async(() => {
+        it('should get the ecm user informations from the service', () => {
+            expect(element.querySelector('#userinfo_container')).toBeDefined();
+            expect(element.querySelector('#ecm_username')).toBeDefined();
+            expect(element.querySelector('#ecm_title')).toBeDefined();
+            expect(element.querySelector('#ecm-user-detail-image')).toBeDefined();
+            expect(element.querySelector('#ecm-user-detail-image').getAttribute('src')).toEqual('src/assets/ecmImg.gif');
+            expect(element.querySelector('#ecm-full-name').innerHTML).toContain('fake-first-name fake-last-name');
+            expect(element.querySelector('#ecm-job-title').innerHTML).toContain('test job');
+        });
+
+        it('should return the anonymous avatar when users do not have images', () => {
             fakeBpmService.respondWithTheUserWithoutImage();
             fakeEcmService.respondWithTheUserWithoutImage();
             userInfoComp.ngOnInit();
             fixture.whenStable()
                 .then(() => {
                     fixture.detectChanges();
-                    let resBpm = userInfoComp.getBpmUserAvatar();
-                    expect(userInfoComp.bpmUserImage).toBeUndefined();
-                    expect(resBpm).toEqual(userInfoComp.anonymouseImageUrl);
-                    let resEcm = userInfoComp.getEcmUserAvatar();
-                    expect(userInfoComp.ecmUserImage).toBeUndefined();
-                    expect(resEcm).toEqual(userInfoComp.anonymouseImageUrl);
+                    let res = userInfoComp.getUserAvatar();
+                    expect(res).toBeDefined();
+                    expect(element.querySelector('#userinfo_container')).toBeDefined();
+                    expect(element.querySelector('#logged-user-img')).toBeDefined();
+                    expect(element.querySelector('#logged-user-img').getAttribute('src')).toContain('src/img/anonymous.gif');
                 });
-        }));
+        });
 
-        it('should return the ecm image if exists', async(() => {
+        it('should show the ecm image if exists', () => {
             fakeBpmService.respondWithTheUserWithImage();
             fakeEcmService.respondWithTheUserWithImage();
             userInfoComp.ngOnInit();
@@ -240,13 +311,14 @@ describe('User info component', () => {
                 .then(() => {
                     fixture.detectChanges();
                     let res = userInfoComp.getUserAvatar();
-                    expect(userInfoComp.bpmUserImage).toBeDefined();
-                    expect(userInfoComp.ecmUserImage).toBeDefined();
-                    expect(res).toEqual(userInfoComp.ecmUserImage);
+                    expect(res).toBeDefined();
+                    expect(element.querySelector('#userinfo_container')).toBeDefined();
+                    expect(element.querySelector('#logged-user-img')).toBeDefined();
+                    expect(element.querySelector('#logged-user-img').getAttribute('src')).toEqual('src/assets/ecmImg.gif');
                 });
-        }));
+        });
 
-        it('should return the bpm image if ecm does not have it', async(() => {
+        it('should show the bpm image if ecm does not have it', () => {
             fakeBpmService.respondWithTheUserWithImage();
             fakeEcmService.respondWithTheUserWithoutImage();
             userInfoComp.ngOnInit();
@@ -254,24 +326,11 @@ describe('User info component', () => {
                 .then(() => {
                     fixture.detectChanges();
                     let res = userInfoComp.getUserAvatar();
-                    expect(userInfoComp.bpmUserImage).toBeDefined();
-                    expect(userInfoComp.ecmUserImage).toBeUndefined();
-                    expect(res).toEqual(userInfoComp.bpmUserImage);
+                    expect(res).toBeDefined();
+                    expect(element.querySelector('#userinfo_container')).toBeDefined();
+                    expect(element.querySelector('#logged-user-img')).toBeDefined();
+                    expect(element.querySelector('#logged-user-img').getAttribute('src')).toEqual('src/assets/bpmImg.gif');
                 });
-        }));
-
-        it('should return the anonynous avatar if no user has it', async(() => {
-            fakeBpmService.respondWithTheUserWithoutImage();
-            fakeEcmService.respondWithTheUserWithoutImage();
-            userInfoComp.ngOnInit();
-            fixture.whenStable()
-                .then(() => {
-                    fixture.detectChanges();
-                    let res = userInfoComp.getUserAvatar();
-                    expect(userInfoComp.bpmUserImage).toBeUndefined();
-                    expect(userInfoComp.ecmUserImage).toBeUndefined();
-                    expect(res).toEqual(userInfoComp.anonymouseImageUrl);
-                });
-        }));
+        });
     });
 });
diff --git a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts
index 9b67109f3e..e2d5968d75 100644
--- a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts
+++ b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.ts
@@ -20,7 +20,7 @@ import { EcmUserModel } from './../models/ecm-user.model';
 import { BpmUserModel } from './../models/bpm-user.model';
 import { EcmUserService } from './../services/ecm-user.service';
 import { BpmUserService } from './../services/bpm-user.service';
-import { AlfrescoAuthenticationService } from 'ng2-alfresco-core';
+import { AlfrescoSettingsService } from 'ng2-alfresco-core';
 
 @Component({
     selector: 'ng2-alfresco-userinfo',
@@ -35,34 +35,32 @@ export class UserInfoComponent implements OnInit {
 
     ecmUser: EcmUserModel;
     bpmUser: BpmUserModel;
-    anonymouseImageUrl: string = this.baseComponentPath + 'img/anonymous.gif';
+    anonymousImageUrl: string = this.baseComponentPath + 'img/anonymous.gif';
     bpmUserImage: any;
     ecmUserImage: any;
 
     constructor(private ecmUserService: EcmUserService,
                 private bpmUserService: BpmUserService,
-                public authService: AlfrescoAuthenticationService) {
+                public setting: AlfrescoSettingsService) {
     }
 
     ngOnInit() {
-
-        if (this.authService.isEcmLoggedIn()) {
+        if (this.setting.getProviders() === 'ECM' ||
+            this.setting.getProviders() === 'ALL') {
             this.ecmUserService.getCurrentUserInfo()
-                .subscribe(
-                    (res) => {
+                .subscribe((res) => {
                         this.ecmUser = <EcmUserModel> res;
-                        this._getEcmAvatar();
+                        this.getEcmAvatar();
                     }
                 );
         }
 
-        if (this.authService.isBpmLoggedIn()) {
+        if (this.setting.getProviders() === 'BPM' ||
+            this.setting.getProviders() === 'ALL') {
             this.bpmUserService.getCurrentUserInfo()
-                .subscribe(
-                    (res) => {
-                        this.bpmUser = <BpmUserModel> res;
-                    }
-                );
+                .subscribe((res) => {
+                    this.bpmUser = <BpmUserModel> res;
+                });
             this.bpmUserService.getCurrentUserProfileImage()
                 .subscribe(
                     (res) => {
@@ -72,24 +70,23 @@ export class UserInfoComponent implements OnInit {
         }
     }
 
-    private _getEcmAvatar() {
+    private getEcmAvatar() {
         this.ecmUserImage = this.ecmUserService.getUserProfileImage(this.ecmUser.avatarId);
     }
 
     getUserAvatar() {
-        return this.ecmUserImage || this.bpmUserImage || this.anonymouseImageUrl;
+        return this.ecmUserImage || this.bpmUserImage || this.anonymousImageUrl;
     }
 
     getBpmUserAvatar() {
-        return this.bpmUserImage || this.anonymouseImageUrl;
+        return this.bpmUserImage || this.anonymousImageUrl;
     }
 
     getEcmUserAvatar() {
-        return this.ecmUserImage || this.anonymouseImageUrl;
+        return this.ecmUserImage || this.anonymousImageUrl;
     }
 
     formatValue(value: string) {
         return value === 'null' ? null : value;
     }
-
 }
diff --git a/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.spec.ts b/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.spec.ts
index 7bb8ba1b91..177c05b30a 100644
--- a/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.spec.ts
+++ b/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.spec.ts
@@ -54,10 +54,6 @@ describe('Bpm User service', () => {
 
     describe('when user is logged in', () => {
 
-        beforeEach(() => {
-            spyOn(authService, 'isBpmLoggedIn').and.returnValue(true);
-        });
-
         it('should be able to retrieve current user info', (done) => {
             service.getCurrentUserInfo().subscribe(
                 (user) => {
@@ -85,7 +81,7 @@ describe('Bpm User service', () => {
                 });
         });
 
-        it('should be able to log errors on call for profile', (done) => {
+        it('should catch errors on call for profile', (done) => {
             service.getCurrentUserInfo().subscribe(() => {
             }, () => {
                 done();
@@ -96,7 +92,7 @@ describe('Bpm User service', () => {
             });
         });
 
-        it('should be able to log errors on call for profile picture', (done) => {
+        it('should catch errors on call for profile picture', (done) => {
             service.getCurrentUserProfileImage().subscribe(() => {
             }, () => {
                 done();
@@ -107,16 +103,4 @@ describe('Bpm User service', () => {
             });
         });
     });
-
-    describe('when user is not logged in', () => {
-        beforeEach(() => {
-            spyOn(authService, 'isBpmLoggedIn').and.returnValue(false);
-        });
-
-        it('should not retrieve the user avatar', () => {
-            spyOn(service, 'callGetProfilePictureApi');
-            service.getCurrentUserInfo();
-            expect(service.callGetProfilePictureApi).not.toHaveBeenCalled();
-        });
-    });
 });
diff --git a/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts b/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts
index d666c17178..0f2f445f8e 100644
--- a/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts
+++ b/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts
@@ -37,26 +37,18 @@ export class BpmUserService {
      * @param userName - the user name
      */
     getCurrentUserInfo(): Observable<BpmUserModel> {
-        if (this.authService.isBpmLoggedIn()) {
-            return Observable.fromPromise(this.authService.getAlfrescoApi().activiti.profileApi.getProfile())
-                .map(
-                    (data) => <BpmUserModel> data
-                )
-                .catch(this.handleError);
-        }
+        return Observable.fromPromise(this.authService.getAlfrescoApi().activiti.profileApi.getProfile())
+            .map((data) => <BpmUserModel> data)
+            .catch(this.handleError);
     }
 
     getCurrentUserProfileImage(): Observable<any> {
-        if (this.authService.isBpmLoggedIn()) {
-            return Observable.fromPromise(this.callGetProfilePictureApi())
-                .map(
-                    (data) => data
-                )
-                .catch(this.handleError);
-        }
+        return Observable.fromPromise(this.callGetProfilePictureApi())
+            .map((data) => data)
+            .catch(this.handleError);
     }
 
-    callGetProfilePictureApi() {
+    private callGetProfilePictureApi() {
         return this.authService.getAlfrescoApi().activiti.profileApi.getProfilePicture();
     }