diff --git a/src/frontend/app/indexation/field-list/field-list.component.html b/src/frontend/app/indexation/field-list/field-list.component.html
index 4f488b3c67d0649282a377974d3eed6cf0ef972e..c70339c666a19010dd037da91740b20ff2832102 100644
--- a/src/frontend/app/indexation/field-list/field-list.component.html
+++ b/src/frontend/app/indexation/field-list/field-list.component.html
@@ -1,7 +1,7 @@
 <div *ngIf="availableCustomFields !== undefined" class="content" cdkDropList id="customFieldsList"
     [cdkDropListConnectedTo]="['indexingModelsCustomFieldsList_mail','indexingModelsCustomFieldsList_contact','indexingModelsCustomFieldsList_process','indexingModelsCustomFieldsList_classement']"
     [cdkDropListData]="availableCustomFields" (cdkDropListDropped)="drop($event)">
-    <div class="customFieldRow" *ngFor="let field of availableCustomFields" cdkDrag [cdkDragData]="field">
+    <div class="customFieldRow" *ngFor="let field of availableCustomFields | sortBy: 'label'" cdkDrag [cdkDragData]="field">
         <div class="customFieldDrag">
             <i color="primary" class="fas fa-arrows-alt fa-2x" cdkDragHandle></i>
         </div>
@@ -71,7 +71,7 @@
 <div *ngIf="availableFields !== undefined" class="content" cdkDropList id="fieldsList"
     [cdkDropListConnectedTo]="['indexingModelsCustomFieldsList_mail','indexingModelsCustomFieldsList_contact','indexingModelsCustomFieldsList_process','indexingModelsCustomFieldsList_classement']"
     [cdkDropListData]="availableFields" (cdkDropListDropped)="drop($event)">
-    <div class="customFieldRow" *ngFor="let field of availableFields" cdkDrag [cdkDragData]="field">
+    <div class="customFieldRow" *ngFor="let field of availableFields | sortBy: 'label'" cdkDrag [cdkDragData]="field">
         <div class="customFieldDrag" cdkDragHandle>
             <i color="primary" class="fas fa-arrows-alt fa-2x"></i>
         </div>
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 acf6fefaf8afffe7124e290ac0b0ec673f416318..dbaa5a187164bfa169d8e24e976e8db5ca94ca61 100644
--- a/src/frontend/app/indexation/indexing-form/indexing-form.component.ts
+++ b/src/frontend/app/indexation/indexing-form/indexing-form.component.ts
@@ -122,8 +122,6 @@ export class IndexingFormComponent implements OnInit {
             identifier: 'senders',
             label: this.lang.getSenders,
             type: 'autocomplete',
-            system: true,
-            mandatory: true,
             default_value : '',
             values: ['/rest/autocomplete/contacts']
         },
@@ -131,8 +129,6 @@ export class IndexingFormComponent implements OnInit {
             identifier: 'destination',
             label: this.lang.destination,
             type: 'select',
-            system: true,
-            mandatory: true,
             default_value : '',
             values: []
         },
@@ -140,8 +136,6 @@ export class IndexingFormComponent implements OnInit {
             identifier: 'folder',
             label: this.lang.folder,
             type: 'autocomplete',
-            system: true,
-            mandatory: true,
             default_value : '',
             values: ['/rest/autocomplete/folders', '/rest/folders']
         },
@@ -150,8 +144,6 @@ export class IndexingFormComponent implements OnInit {
             label: this.lang.docDate,
             unit: 'mail',
             type: 'date',
-            system: true,
-            mandatory: true,
             default_value : '',
             values: []
         },
@@ -160,8 +152,6 @@ export class IndexingFormComponent implements OnInit {
             label: this.lang.arrivalDate,
             unit: 'mail',
             type: 'date',
-            system: true,
-            mandatory: true,
             default_value : '',
             values: []
         },
@@ -232,6 +222,7 @@ export class IndexingFormComponent implements OnInit {
                 event.container.data,
                 event.previousIndex,
                 event.currentIndex);
+            this.initElemForm();
         }
     }