diff --git a/src/app/registeredMail/controllers/RegisteredMailController.php b/src/app/registeredMail/controllers/RegisteredMailController.php
index eb56eb3dee670c12e3296feca6238ddf09c9b379..99f0073dc7a2bef7b452ac42cde145c6e332b975 100644
--- a/src/app/registeredMail/controllers/RegisteredMailController.php
+++ b/src/app/registeredMail/controllers/RegisteredMailController.php
@@ -897,7 +897,7 @@ class RegisteredMailController
         if (!empty($registeredMail)) {
             $registeredMail[0]['recipient']   = json_decode($registeredMail[0]['recipient'], true);
             $registeredMail[0]['number']      = $registeredMail[0]['alt_identifier'];
-            $registeredMail[0]['issuingSite'] = 'issuingSite#'.$registeredMail[0]['issuing_site'];
+            $registeredMail[0]['issuingSite'] = $registeredMail[0]['issuing_site'];
             unset($registeredMail[0]['issuing_site']);
         }
 
diff --git a/src/frontend/app/actions/save-registered-mail-action/save-registered-mail-action.component.ts b/src/frontend/app/actions/save-registered-mail-action/save-registered-mail-action.component.ts
index 8965f11a7a021d4f77cb05731b5430da25e4c4f4..ffd984e50c43eeab7229735b8c9ea9caf23bd44c 100644
--- a/src/frontend/app/actions/save-registered-mail-action/save-registered-mail-action.component.ts
+++ b/src/frontend/app/actions/save-registered-mail-action/save-registered-mail-action.component.ts
@@ -8,12 +8,12 @@ import { tap, exhaustMap, catchError, finalize } from 'rxjs/operators';
 import { of } from 'rxjs';
 
 @Component({
-    templateUrl: "save-registered-mail-action.component.html",
+    templateUrl: 'save-registered-mail-action.component.html',
     styleUrls: ['save-registered-mail-action.component.scss'],
 })
 export class SaveRegisteredMailActionComponent implements OnInit {
 
-    
+
     loading: boolean = false;
 
     @ViewChild('noteEditor', { static: true }) noteEditor: NoteEditorComponent;
@@ -42,17 +42,18 @@ export class SaveRegisteredMailActionComponent implements OnInit {
             tap((data: any) => {
                 this.data.resIds = [data.resId];
             }),
-            exhaustMap(() => this.http.put(this.data.indexActionRoute, { resource: this.data.resIds[0], note: this.noteEditor.getNote(), 
-                    data: {
-                        type: this.data.resource.registeredMail_type,
-                        warranty: this.data.resource.registeredMail_warranty,
-                        issuingSiteId: this.data.resource.registeredMail_issuingSite.split('#').slice(-1)[0],
-                        letter: this.data.resource.registeredMail_letter,
-                        recipient: this.data.resource.registeredMail_recipient,
-                        reference: this.data.resource.registeredMail_reference,
-                        generated: false
-                    }
-                })
+            exhaustMap(() => this.http.put(this.data.indexActionRoute, {
+                resource: this.data.resIds[0], note: this.noteEditor.getNote(),
+                data: {
+                    type: this.data.resource.registeredMail_type,
+                    warranty: this.data.resource.registeredMail_warranty,
+                    issuingSiteId: this.data.resource.registeredMail_issuingSite,
+                    letter: this.data.resource.registeredMail_letter,
+                    recipient: this.data.resource.registeredMail_recipient,
+                    reference: this.data.resource.registeredMail_reference,
+                    generated: false
+                }
+            })
             ),
             tap(() => {
                 this.dialogRef.close(this.data.resIds);
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 9fdbca33f410d551733614a33859a6ea602fb1b7..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 : `issuingSite#${item.siteId}`,
+                        id: item.siteId,
                         label: `${item.label} (${item.customerAccountNumber})`,
                         disabled: item.fullness === 100,
                     };
@@ -77,9 +79,7 @@ export class IssuingSiteInputComponent implements OnInit {
     }
 
     setAddress(id: any) {
-        const siteId = id.split('#').slice(-1)[0];
-
-        this.http.get(`../rest/registeredMail/sites/${siteId}`).pipe(
+        this.http.get(`../rest/registeredMail/sites/${id}`).pipe(
             tap((data: any) => {
                 this.issuingSiteAddress = data['site'];
             }),
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