diff --git a/src/includes/mentor/resources/create.pug b/src/includes/mentor/resources/create.pug
index 799cb9f3400594dd50d8ee9ed87abf4e8675dcc8..bf4d702c79484c007ee80961bf6e2f7d5fc9213d 100644
--- a/src/includes/mentor/resources/create.pug
+++ b/src/includes/mentor/resources/create.pug
@@ -34,7 +34,7 @@ p.p_entete=`${data.ThankYouEnrichingDatabase}`
         label-header_related=`${data.RelatedResources}`
 
         label-name=`${data.TitleRequired}`
-        label-country=`${data.Country}`
+        label-country=`${data.Country}*`
         label-language=`${data.Language}*`
         label-uri=`${data.LocationWeblinkReq}`
         label-format=`${data.FormatReq}`
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index 1f7f039e085e666a910b89fe0d858c59c7c7635a..6fa6facf4b9f23b4c92831f64a08403cbfaf84b9 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -577,6 +577,28 @@ function addProperFilterToSearchComponents(targetId) {
   });
 }
 
+function listenToInputChangeOnResourceCreation(originalForm) {
+  let submitInput = originalForm.querySelectorAll('input[type=submit]')[0];
+  if (originalForm.querySelectorAll('input[name="name"]')[0].value != "" &&
+      originalForm.querySelectorAll('input[name="uri"]')[0].value != "" &&
+      originalForm.querySelectorAll('input[name="author"]')[0].value != "" &&
+      originalForm.querySelectorAll('textarea[name="skills"]')[0].value != "" &&
+      originalForm.querySelectorAll('select[name="fields"]')[0].value != "" &&
+      originalForm.querySelectorAll('select[name="target"]')[0].value != "" &&
+      originalForm.querySelectorAll('select[name="type"]')[0].value != "" &&
+      originalForm.querySelectorAll('select[name="steps"]')[0].value != "" &&
+      originalForm.querySelectorAll('select[name="format"]')[0].value != "" &&
+      originalForm.querySelectorAll('select[name="sharing"]')[0].value != "" &&
+      originalForm.querySelectorAll('select[name="country"]')[0].value != "" &&
+      originalForm.querySelectorAll('select[name="language"]')[0].value != "") {
+    submitInput.disabled = false;
+    submitInput.classList.remove('disabled');
+  } else {
+    submitInput.disabled = true;
+    submitInput.classList.add('disabled');
+  }
+}
+
 /* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 XXXXXXXXXXXXXXXXXXXXXXXXXXXX ON LOAD XXXXXXXXXXXXXXXXXXXXXXX
@@ -595,23 +617,77 @@ jQuery(document).ready(function($) {
     let submitInput = mentorCreationForm.querySelectorAll('input[type=submit]')[0];
     submitInput.disabled = true;
     submitInput.classList.add('disabled');
-    const textInputs = mentorCreationForm.querySelectorAll('input[type="text"]');
-    textInputs.forEach(function(text_input) {
-      text_input.addEventListener('focusout', (() => {
+    const inputsList = mentorCreationForm.querySelectorAll('input[type="text"]' + ',select');
+    inputsList.forEach(function(input) {
+      input.addEventListener('focusout', (() => {
+        let submitInput = mentorCreationForm.querySelectorAll('input[type=submit]')[0];
+        if (mentorCreationForm.querySelectorAll('input[name="first_name"]')[0].value != "" &&
+            mentorCreationForm.querySelectorAll('input[name="last_name"]')[0].value != "" &&
+            mentorCreationForm.querySelectorAll('input[name="mentorProfile.city"]')[0].value != "" &&
+            mentorCreationForm.querySelectorAll('select[name="mentorProfile.languages"]')[0].value != "" &&
+            mentorCreationForm.querySelectorAll('select[name="mentorProfile.fields"]')[0].value != "" &&
+            mentorCreationForm.querySelectorAll('select[name="mentorProfile.country"]')[0].value != "") {
+          submitInput.disabled = false;
+          submitInput.classList.remove('disabled');
+        } else {
+          submitInput.disabled = true;
+          submitInput.classList.add('disabled');
+        }
+      }));
+      
+      input.addEventListener('change', (() => {
+        let submitInput = mentorCreationForm.querySelectorAll('input[type=submit]')[0];
         if (mentorCreationForm.querySelectorAll('input[name="first_name"]')[0].value != "" &&
             mentorCreationForm.querySelectorAll('input[name="last_name"]')[0].value != "" &&
             mentorCreationForm.querySelectorAll('input[name="mentorProfile.city"]')[0].value != "" &&
             mentorCreationForm.querySelectorAll('select[name="mentorProfile.languages"]')[0].value != "" &&
             mentorCreationForm.querySelectorAll('select[name="mentorProfile.fields"]')[0].value != "" &&
             mentorCreationForm.querySelectorAll('select[name="mentorProfile.country"]')[0].value != "") {
-          let submitInput = mentorCreationForm.querySelectorAll('input[type=submit]')[0];
           submitInput.disabled = false;
           submitInput.classList.remove('disabled');
+        } else {
+          submitInput.disabled = true;
+          submitInput.classList.add('disabled');
         }
       }));
     });
   });
 
+  const mentorResourceCreationForm = document.getElementById('resource_creation_form');
+  mentorResourceCreationForm.addEventListener("populate", e => {
+    let submitInput = mentorResourceCreationForm.querySelectorAll('input[type=submit]')[0];
+    submitInput.disabled = true;
+    submitInput.classList.add('disabled');
+    let inputs = mentorResourceCreationForm.querySelectorAll('input[type="text"]' + ',select' + ',textarea');
+    console.log(inputs);
+    inputs.forEach(function(input) {
+      input.addEventListener('focusout', (() => {
+        listenToInputChangeOnResourceCreation(mentorResourceCreationForm);
+      }));
+      input.addEventListener('change', (() => {
+        listenToInputChangeOnResourceCreation(mentorResourceCreationForm);
+      }));
+    });
+  });
+
+  const mentorResourceEditionForm = document.getElementById('resource_edition_form');
+  mentorResourceEditionForm.addEventListener("populate", e => {
+    let submitInput = mentorResourceEditionForm.querySelectorAll('input[type=submit]')[0];
+    submitInput.disabled = true;
+    submitInput.classList.add('disabled');
+    console.log(submitInput);
+    let inputs = mentorResourceEditionForm.querySelectorAll('input[type="text"]' + ',select' + ',textarea');
+    console.log(inputs);
+    inputs.forEach(function(input) {
+      input.addEventListener('focusout', (() => {
+        listenToInputChangeOnResourceCreation(mentorResourceEditionForm);
+      }));
+      input.addEventListener('change', (() => {
+        listenToInputChangeOnResourceCreation(mentorResourceEditionForm);
+      }));
+    });
+  });
+
   //Set the share links
   $(".twitter-link").on("populate", function (e) {
     var regexContributor = /mentor/g