diff --git a/src/frontend/app/administration/alfresco/alfresco-administration.component.html b/src/frontend/app/administration/alfresco/alfresco-administration.component.html
index f8cfc5ca02ef5340a9fc5ed69261b12f126e0d07..2eed6260442c51e2d87406844ce1dcbd25f18caa 100644
--- a/src/frontend/app/administration/alfresco/alfresco-administration.component.html
+++ b/src/frontend/app/administration/alfresco/alfresco-administration.component.html
@@ -78,7 +78,7 @@
                         </div>
                         <div class="col-sm-12 text-center" style="padding:10px;">
                             <button mat-raised-button type="button" color="primary" (click)="checkAccount()"
-                                [disabled]="functionsService.empty(alfresco.account.id) || functionsService.empty(alfresco.account.password)">{{lang.test}}</button>
+                                [disabled]="functionsService.empty(alfresco.account.id) || (functionsService.empty(alfresco.account.password) && creationMode)">{{lang.test}}</button>
 
                             <button mat-raised-button type="submit" color="primary"
                                 [disabled]="!alfrescoForm.valid || !validAccount()">{{lang.validate}}</button>
diff --git a/src/frontend/app/administration/alfresco/alfresco-administration.component.ts b/src/frontend/app/administration/alfresco/alfresco-administration.component.ts
index c72b9b5e707ab7f32eb4f6f81a4a0dd6229b900d..0dd2fb469668e267ee4b0ede915f3b569d749f64 100644
--- a/src/frontend/app/administration/alfresco/alfresco-administration.component.ts
+++ b/src/frontend/app/administration/alfresco/alfresco-administration.component.ts
@@ -280,7 +280,23 @@ export class AlfrescoAdministrationComponent implements OnInit {
     }
 
     checkAccount() {
-        this.http.post(`../rest/alfresco/checkAccounts`, { login: this.alfresco.account.id, password: this.alfresco.account.password, nodeId : this.alfresco.rootFolder }).pipe(
+        let alfresco  = {};
+        if (!this.creationMode) {
+            alfresco = {
+                accountId : this.alfresco.id,
+                login: this.alfresco.account.id,
+                password: this.alfresco.account.password,
+                nodeId : this.alfresco.rootFolder
+            };
+        } else {
+            alfresco = {
+                login: this.alfresco.account.id,
+                password: this.alfresco.account.password,
+                nodeId : this.alfresco.rootFolder
+            };
+        }
+
+        this.http.post(`../rest/alfresco/checkAccounts`, alfresco).pipe(
             tap(() => {
                 this.notify.success(this.lang.testSucceeded);
             }),