diff --git a/src/includes/entrepreneur/components/header.pug b/src/includes/entrepreneur/components/header.pug
index 2e707496280b4a80755342de18352d81684237b2..5d66d6b93471ae85848e6c8bc393cecbe83daa10 100644
--- a/src/includes/entrepreneur/components/header.pug
+++ b/src/includes/entrepreneur/components/header.pug
@@ -19,7 +19,7 @@
             //- input.ico_droite.ico_search  
             
             .dropdownWrapper
-                sib-display#user-account-picture.dropdownLabel(
+                sib-display#entrepreneur-account-picture.dropdownLabel(
                     bind-user
                     fields='account.picture',
                     widget-account.picture='cs-account-picture'
diff --git a/src/includes/mentor/components/header.pug b/src/includes/mentor/components/header.pug
index 0f09c6476c9c75384edd320c7ebb8b509e9308be..7ea9889c09f5429d9a3c6965621f4e4dc3ffb812 100644
--- a/src/includes/mentor/components/header.pug
+++ b/src/includes/mentor/components/header.pug
@@ -19,7 +19,7 @@
             //- input.ico_droite.ico_search  
             
             .dropdownWrapper
-                sib-display#user-account-picture.dropdownLabel(
+                sib-display#mentor-account-picture.dropdownLabel(
                     bind-user
                     fields='account.picture',
                     widget-account.picture='cs-account-picture'
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index f0c921e4d1a8a58345f16c815900e190ecb5f628..3514385e281999559a1fd5562389e355a3f59c10 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -513,20 +513,24 @@ jQuery(document).ready(function($) {
   refreshList("improvement-dialog-form", "pending-resources");
   refreshList("entrepreneur_profile_creation", "entrepreneur_info");
   refreshList("entrepreneur_profile_creation", "entrepreneur_contact");
-  refreshList("entrepreneur_profile_creation", "user-account-picture");
+  refreshList("entrepreneur_profile_creation", "entrepreneur-account-picture");
   refreshList("mentor_profile_creation", "mentor_info");
   refreshList("mentor_profile_creation", "mentor_complementary");
   refreshList("mentor_profile_creation", "mentor_contact");
-  refreshList("mentor_profile_creation", "user-account-picture");
+  refreshList("mentor_profile_creation", "mentor-account-picture");
   refreshList("entrepreneur_profile_edition", "entrepreneur_info");
   refreshList("entrepreneur_profile_edition", "entrepreneur_contact");
-  refreshList("entrepreneur_profile_edition", "user-account-picture");
+  refreshList("entrepreneur_profile_edition", "entrepreneur-account-picture");
   refreshList("mentor_profile_edition", "mentor_info");
   refreshList("mentor_profile_edition", "mentor_complementary");
   refreshList("mentor_profile_edition", "mentor_contact");
-  refreshList("mentor_profile_edition", "user-account-picture");
+  refreshList("mentor_profile_edition", "mentor-account-picture");
   refreshList("change_status_request", "request-list");
 
+  addProperFilterToSearchComponents("entrepreneur-resource-list");
+  addProperFilterToSearchComponents("mentor-database");
+  addProperFilterToSearchComponents("public-resource-list");
+
   var header_dropdown = $(".dropdownWrapper"),
     drop_choices = header_dropdown.find(".dropdownLabel");
 
@@ -611,11 +615,14 @@ jQuery(document).ready(function($) {
    
     //Correct the native default of pagination
     refreshPagination();
-  }, 3000);
-
 
-  //In the entrepreneur dashboard, we set data from the display form to the hidden ones.
-  addProperFilterToSearchComponents("entrepreneur-resource-list");
-  addProperFilterToSearchComponents("mentor-database");
-  addProperFilterToSearchComponents("public-resource-list");
+    var forms = baseElement.querySelectorAll(".resource_by_step");
+    forms.forEach(form => {
+      form.addEventListener("populate", e => {
+        let tab = document.getElementById("type1");
+        selectHiddenManagementForType(tab, form);
+      })
+    })
+      
+  }, 3000);
 });