diff --git a/src/app/entity/controllers/ListInstanceController.php b/src/app/entity/controllers/ListInstanceController.php
index 36afc5b8a237bdc7489a119dddc8bee3676a241a..9d381414f2e35a88583dd74e0e01135413573f48 100755
--- a/src/app/entity/controllers/ListInstanceController.php
+++ b/src/app/entity/controllers/ListInstanceController.php
@@ -56,6 +56,8 @@ class ListInstanceController
                 $listInstances[$key]['labelToDisplay'] = Entitymodel::getByEntityId(['entityId' => $value['item_id'], 'select' => ['entity_label']])['entity_label'];
                 $listInstances[$key]['descriptionToDisplay'] = '';
             } else {
+                $user = UserModel::getByLogin(['login' => $value['item_id'], 'select' => ['id']]);
+                $listInstances[$key]['userId'] = $user['id'];
                 $listInstances[$key]['labelToDisplay'] = UserModel::getLabelledUserById(['login' => $value['item_id']]);
                 $listInstances[$key]['descriptionToDisplay'] = UserModel::getPrimaryEntityByUserId(['userId' => $value['item_id']])['entity_label'];
             }
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 ef6a1aa56bd9552494b673c3817ac8f70e164f3e..2239c721d36ff3c5ac64f1d66308304e89ba186d 100644
--- a/src/frontend/app/indexation/indexing-form/indexing-form.component.ts
+++ b/src/frontend/app/indexation/indexing-form/indexing-form.component.ts
@@ -786,7 +786,9 @@ export class IndexingFormComponent implements OnInit {
                         }
 
                         if (field.identifier == 'initiator' && this.mode == 'indexation' && this.functions.empty(field.default_value)) {
-                            field.default_value = this.headerService.user.entities.filter((entity: any) => entity.primary_entity == 'Y')[0].id;
+                            if (this.headerService.user.entities[0]) {
+                                field.default_value = this.headerService.user.entities.filter((entity: any) => entity.primary_entity == 'Y')[0].id;
+                            }
                         }
 
                         if (fieldExist) {