diff --git a/src/includes/mentor/resources/resource-report-broken-link.pug b/src/includes/mentor/resources/resource-report-broken-link.pug
index b7b2be128ebd3e240103e7095deb863946989c9e..568286d98ef289944a42895f2fd9d48bf22d495e 100644
--- a/src/includes/mentor/resources/resource-report-broken-link.pug
+++ b/src/includes/mentor/resources/resource-report-broken-link.pug
@@ -8,8 +8,8 @@
     p The submitter of the resource will be advised that this link is broken.
     sib-form#report-broken-link(
         data-src=`${endpoints.brokenlinks}`
-        fields = "resource_id, submitter"
-        widget-resource_id='sib-form-hidden'
+        fields = "resource, submitter"
+        widget-resource='sib-form-hidden'
         widget-submitter='sib-form-hidden'
         submit-button='ok'
         next="mentor-resource-list"
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index ec974a8da3a3620ee2761a911ac8bfa70d37c26b..5c051ad17da144af4577579300ea8157d7f0ee65 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -144,15 +144,15 @@ function selectHiddenManagementForType(tab, form) {
 }
 
 //Manage the report broken links hidden form
-function fillReportBrokenLinkForm(event) {
+function fillReportBrokenLinkForm(event, userWhoSubmitReport) {
   var formBrokenLink = document.getElementById("report-broken-link");
 
   formBrokenLink.querySelector(
-    "input[name='resource_id']"
+    "input[name='resource']"
   ).value = JSON.stringify({ "@id": event.target.dataset.src });
   formBrokenLink.querySelector(
     "input[name='submitter']"
-  ).value = JSON.stringify({ "@id": userAccountDataSrc.dataset.src });
+  ).value = JSON.stringify({ "@id": userWhoSubmitReport });
 }
 
 function addProperFilterToSearchComponents(targetId) {
@@ -174,7 +174,9 @@ function addProperFilterToSearchComponents(targetId) {
       //https://git.happy-dev.fr/startinblox/framework/sib-core/issues/379
       //TODO: Wait for a solution to filter with multiple value with "OR" instead of "AND".
       let keyword_form = baseElement.querySelectorAll(".search-by-keyword")[0];
-      let keyword_field = keyword_form.querySelector(`input[name="name_keyword"]`);
+      let keyword_field = keyword_form.querySelector(
+        `input[name="name_keyword"]`
+      );
 
       let keyword_submit = baseElement.querySelectorAll(" .keyword_submit")[0];
       let keyword_hidden_fields = baseElement.querySelectorAll(
@@ -388,7 +390,8 @@ jQuery(document).ready(function($) {
     //Manage the form to report broken link.
     let detailsMentor = document.getElementById("detail-mentor");
     detailsMentor.addEventListener("populate", event => {
-      fillReportBrokenLinkForm(event);
+      var userWhoSubmitReport =  userAccountDataSrc.dataset.src
+      fillReportBrokenLinkForm(event, userWhoSubmitReport);
     });
 
     var forms = document.querySelectorAll("sib-form");
@@ -460,7 +463,9 @@ jQuery(document).ready(function($) {
     //Manage the form to report broken link.
     let detailsEntrepreneur = document.getElementById("detail-entrepreneur");
     detailsEntrepreneur.addEventListener("populate", event => {
-      fillReportBrokenLinkForm(event);
+      var userWhoSubmitReport =  userAccountDataSrc.dataset.src
+
+      fillReportBrokenLinkForm(event, userWhoSubmitReport);
     });
 
     //Accordion by step