diff --git a/src/frontend/app/administration/alfresco/alfresco-administration.component.html b/src/frontend/app/administration/alfresco/alfresco-administration.component.html
index e291d463bb0dfcc3da22704f5163b1394b66fd84..5643629bf7ed15a33f4056aefaba9a7045a7a2c7 100644
--- a/src/frontend/app/administration/alfresco/alfresco-administration.component.html
+++ b/src/frontend/app/administration/alfresco/alfresco-administration.component.html
@@ -28,7 +28,7 @@
                                 <div class="formType-title">
                                     {{lang.alfrescoAccount}}
                                 </div>
-                                <div style="width: 100%;">
+                                <div style="width: 100%;text-align: center;">
                                     <mat-form-field>
                                         <input matInput [(ngModel)]="alfresco.account.id" required name="accountId"
                                             id="accountId" title="{{lang.id}}" type="text" placeholder="{{lang.id}}">
@@ -41,6 +41,7 @@
                                             (click)="hidePassword = !hidePassword" class="fa fa-2x"
                                             [ngClass]="[hidePassword ? 'fa-eye-slash' : 'fa-eye']"></mat-icon>
                                     </mat-form-field>
+                                    <button mat-raised-button type="button" color="primary" (click)="checkAccount()" [disabled]="functionsService.empty(alfresco.account.id) || functionsService.empty(alfresco.account.password)">{{lang.test}}</button>
                                 </div>
                             </div>
                             <div class="formType ratio-1 col-sm-12">
diff --git a/src/frontend/app/administration/alfresco/alfresco-administration.component.ts b/src/frontend/app/administration/alfresco/alfresco-administration.component.ts
index 40c2b1b95c1549124dfea03d8d855a0ebd22e812..1b3af8496ceb208e2afd54c8d61a420d5d765a41 100644
--- a/src/frontend/app/administration/alfresco/alfresco-administration.component.ts
+++ b/src/frontend/app/administration/alfresco/alfresco-administration.component.ts
@@ -10,6 +10,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { tap } from 'rxjs/internal/operators/tap';
 import { catchError } from 'rxjs/internal/operators/catchError';
 import { of } from 'rxjs/internal/observable/of';
+import { map } from 'rxjs/internal/operators/map';
 
 @Component({
     selector: 'app-alfresco',
@@ -136,9 +137,25 @@ export class AlfrescoAdministrationComponent implements OnInit {
 
     getEntities() {
         return new Promise((resolve, reject) => {
-            this.http.get(`../rest/administration/shippings/new`).pipe(
-                tap((data: any) => {
-                    this.entities = data['entities'];
+            this.http.get(`../rest/entities`).pipe(
+                map((data: any) => {
+                    data.entities = data.entities.map((entity: any) => {
+                        return {
+                            text: entity.entity_label,
+                            icon: entity.icon,
+                            parent: entity.parentSerialId,
+                            id: entity.serialId.toString(),
+                            state: {
+                                opened: true
+                            }
+                        };
+                    });
+                    return data.entities;
+                }),
+                tap((entities: any) => {
+                    console.log(entities);
+
+                    this.entities = entities;
                     resolve(true);
                 }),
                 catchError((err: any) => {
@@ -152,9 +169,23 @@ export class AlfrescoAdministrationComponent implements OnInit {
     initAccount() {
         return new Promise((resolve, reject) => {
             if (this.creationMode) {
-                this.http.get('../rest/administration/shippings/new').pipe(
-                    tap((data: any) => {
-                        this.entities = data['entities'];
+                this.http.get('../rest/entities').pipe(
+                    map((data: any) => {
+                        data.entities = data.entities.map((entity: any) => {
+                            return {
+                                text: entity.entity_label,
+                                icon: entity.icon,
+                                parent: entity.parentSerialId,
+                                id: entity.serialId.toString(),
+                                state: {
+                                    opened: true
+                                }
+                            };
+                        });
+                        return data.entities;
+                    }),
+                    tap((entities: any) => {
+                        this.entities = entities;
 
                         this.entities.forEach(element => {
                             if (this.availableEntities.indexOf(+element.id) > -1) {
@@ -247,4 +278,16 @@ export class AlfrescoAdministrationComponent implements OnInit {
             return true;
         }
     }
+
+    checkAccount() {
+        this.http.post(`../rest/alfresco/checkAccounts`, { login: this.alfresco.account.id, password: this.alfresco.account.password }).pipe(
+            tap(() => {
+                this.notify.success(this.lang.accountOk);
+            }),
+            catchError((err: any) => {
+                this.notify.error(this.lang.accountFailed);
+                return of(false);
+            })
+        ).subscribe();
+    }
 }
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index 41f44487b954a74ba072189d695abe319d0d586e..f304706a8f28c9ac69cd8b0c6d7d238af9029ab0 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -1689,4 +1689,7 @@ export const LANG_EN = {
     "rootFolder": "Root folder",
     "chooseEntityAssociationAccount": "Choose entities who will be able to use this account",
     "alfrescoAPI": "API Alfresco address",
+    "accountOk": "This account exists",
+    "accountFailed": "This account does not exist",
+    "test": "test",
 };
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index 851145166931073ac68bb243f5f8c72bfee3b079..a325261f955cfa9e67b1f0f5dbc51a7f780e75d9 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -1691,4 +1691,7 @@ export const LANG_FR = {
     "rootFolder": "Dépôt racine",
     "chooseEntityAssociationAccount": "Attribuer le compte au(x) service(s)",
     "alfrescoAPI": "Adresse de l'API Alfresco",
+    "accountOk": "Le compte éxiste",
+    "accountFailed": "Le compte n'éxiste pas",
+    "test": "Tester",
 };
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index d8327cc211602e25fa2c2bb8df43fd4092ff2a91..b1d5947b635796f09dc713b7a727f298cbc83e0c 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -1673,4 +1673,7 @@ export const LANG_NL = {
     "rootFolder": "Root folder", //_TO_TRANSLATE
     "chooseEntityAssociationAccount": "Choose entities who will be able to use this account", //_TO_TRANSLATE
     "alfrescoAPI": "API Alfresco address", //_TO_TRANSLATE
+    "accountOk": "This account exists", //_TO_TRANSLATE
+    "accountFailed": "This account does not exist", //_TO_TRANSLATE
+    "test": "test", //_TO_TRANSLATE
 };