diff --git a/src/frontend/app/administration/registered-mail/issuing-site/indexing/issuing-site-input.component.ts b/src/frontend/app/administration/registered-mail/issuing-site/indexing/issuing-site-input.component.ts
index 276e031981def63d0341763ae55c96ed36191b4c..7cc3e09076a19d5519f5eb297848fc5b5d40f925 100644
--- a/src/frontend/app/administration/registered-mail/issuing-site/indexing/issuing-site-input.component.ts
+++ b/src/frontend/app/administration/registered-mail/issuing-site/indexing/issuing-site-input.component.ts
@@ -49,7 +49,9 @@ export class IssuingSiteInputComponent implements OnInit {
             this.getIssuingSites(this.registedMailType);
         }
         if (!this.functions.empty(this.control.value)) {
-            this.setAddress(this.control.value);
+            setTimeout(() => {
+                this.setAddress(this.control.value);
+            }, 0);
         }
     }
 
@@ -62,7 +64,7 @@ export class IssuingSiteInputComponent implements OnInit {
                 this.issuingSiteList = data['ranges'].filter((item: any) => item.registeredMailType === registeredMailType && item.status === 'OK' && item.entities.indexOf(this.headerService.user.entities[0].id) > -1).map((item: any) => {
                     return {
                         ...item,
-                        id : item.siteId,
+                        id: item.siteId,
                         label: `${item.label} (${item.customerAccountNumber})`,
                         disabled: item.fullness === 100,
                     };
diff --git a/src/frontend/app/indexation/indexing-form/indexing-form.component.ts b/src/frontend/app/indexation/indexing-form/indexing-form.component.ts
index 650e21b031ea8d3a02866008d6455e98696b5f7b..4929a651b960ba6b52ecc480922ed9069b2e2c04 100755
--- a/src/frontend/app/indexation/indexing-form/indexing-form.component.ts
+++ b/src/frontend/app/indexation/indexing-form/indexing-form.component.ts
@@ -449,7 +449,7 @@ export class IndexingFormComponent implements OnInit {
                             this.http.put(`../rest/registeredMails/${this.resId}`, {
                                     type: formatdatas.registeredMail_type,
                                     warranty: formatdatas.registeredMail_warranty,
-                                    issuingSiteId: formatdatas.registeredMail_issuingSite.split('#').slice(-1)[0],
+                                    issuingSiteId: formatdatas.registeredMail_issuingSite,
                                     letter: formatdatas.registeredMail_letter,
                                     recipient: formatdatas.registeredMail_recipient,
                                     reference: formatdatas.registeredMail_reference