diff --git a/package.json b/package.json
index c31d2418f9b2c662d7f2de7a27f7305d1a81b813..a0a9d9868685146c123fb84a8739b3d180c65464 100755
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "@angular/platform-browser-dynamic": "^10.1.3",
     "@angular/platform-server": "^10.1.3",
     "@angular/router": "^10.1.3",
-    "@fortawesome/fontawesome-free": "^5.15.0",
+    "@fortawesome/fontawesome-free": "^5.15.1",
     "@swimlane/ngx-charts": "^16.0.0",
     "@types/datatables.net": "^1.10.19",
     "@types/jquery": "^3.5.1",
@@ -67,7 +67,7 @@
     "ngx-pipes": "^2.7.5",
     "node-sass": "^4.14.1",
     "nodemon": "^2.0.4",
-    "npm-check-updates": "^9.0.2",
+    "npm-check-updates": "^9.0.4",
     "pdfjs-dist": "2.5.207",
     "photoswipe": "^4.1.3",
     "protractor": "^7.0.0",
diff --git a/sql/data_fr.sql b/sql/data_fr.sql
index a0b6ad3c13adfdeec1de5944e0aba59ddca3e38d..ba3cd8c3ec871127d7cfabc2b235d3145de4d154 100755
--- a/sql/data_fr.sql
+++ b/sql/data_fr.sql
@@ -137,6 +137,9 @@ INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESPONSABLE', 'm
 INSERT INTO usergroups_services (group_id, service_id) VALUES ('RESPONSABLE', 'include_folders_and_followed_resources_perimeter');
 INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N1', 'admin');
 INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N1', 'adv_search_mlb');
+INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N1', 'admin_search');
+INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N1', 'admin_registered_mail');
+INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N1', 'admin_alfresco');
 INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N1', 'admin_users');
 INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N1', 'admin_groups');
 INSERT INTO usergroups_services (group_id, service_id) VALUES ('ADMINISTRATEUR_N1', 'admin_architecture');
diff --git a/src/app/resource/controllers/StoreController.php b/src/app/resource/controllers/StoreController.php
index c2cf3da3ed91f6df2a7856c22b862e4bd42d5d1d..3265115206cc24c2f1fabea325bf6033f253b7bf 100755
--- a/src/app/resource/controllers/StoreController.php
+++ b/src/app/resource/controllers/StoreController.php
@@ -267,10 +267,22 @@ class StoreController
         $resource = ResModel::getById(['resId' => $args['resId'], 'select' => ['version', 'alt_identifier', 'external_id', 'category_id', 'type_id', 'destination']]);
 
         if (!empty($args['modelId'])) {
-            $preparedData['model_id'] = $args['modelId'];
-            $indexingModel = IndexingModelModel::getById(['id' => $args['modelId'], 'select' => ['category']]);
+            $preparedData['model_id']    = $args['modelId'];
+            $indexingModel               = IndexingModelModel::getById(['id' => $args['modelId'], 'select' => ['category']]);
             $preparedData['category_id'] = $indexingModel['category'];
-            $resource['category_id'] = $indexingModel['category'];
+            $resource['category_id']     = $indexingModel['category'];
+
+            $indexingModelField = IndexingModelFieldModel::get(['select' => ['default_value'], 'where' => ['model_id = ?', 'identifier = ?'], 'data' => [$args['modelId'], 'destination']]);
+            $newDestination     = json_decode($indexingModelField[0]['default_value']);
+            if (empty($resource['destination']) && !empty($newDestination)) {
+                if ($newDestination == "#myPrimaryEntity") {
+                    $entity = UserModel::getPrimaryEntityById(['id' => $GLOBALS['id'], 'select' => ['entities.entity_id']]);
+                    $preparedData['destination'] = $entity['entity_id'];
+                } else {
+                    $entity = EntityModel::getById(['id' => $newDestination, 'select' => ['entity_id']]);
+                    $preparedData['destination'] = $entity['entity_id'];
+                }
+            }
         }
         if (empty($resource['alt_identifier'])) {
             $chrono = ChronoModel::getChrono(['id' => $resource['category_id'], 'entityId' => $resource['destination'], 'typeId' => $resource['type_id'], 'resId' => $args['resId']]);
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 4c0528840bc04e1eff5d3f40695e6daffe42a195..a443c910d8b46fd8411d900a33434f9a7b3cace0 100755
--- a/src/frontend/app/indexation/indexing-form/indexing-form.component.ts
+++ b/src/frontend/app/indexation/indexing-form/indexing-form.component.ts
@@ -605,7 +605,7 @@ export class IndexingFormComponent implements OnInit {
                         let title = '';
                         if (elem.default_value === '#myPrimaryEntity') {
                             this.selfDest = this.currentCategory === 'outgoing';
-                            elem.default_value = this.headerService.user.entities[0].id;
+                            elem.default_value = this.headerService.user.entities[0]?.id;
                             this.arrFormControl[elem.identifier].setValue(elem.default_value);
                         } else {
                             this.selfDest = false;