diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index c96782721d7a8e7c6127e91612f92cf67e560b23..c920900b3ac90b8c16b4c10814ac86057a23f74d 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -672,7 +672,7 @@ function listenToInputChangeOnResourceCreation(originalForm) {
     }
   });
   
-  if (isValid.length == 13) {
+  if (isValid.length == resourcesFieldsSelector.length) {
     submitInput.disabled = false;
     submitInput.classList.remove('disabled');
   } else {
@@ -691,7 +691,7 @@ function listenToInputChangeOnMentorAccountCompletion(originalForm) {
     }
   });
 
-  if (isValid.length == 6) {
+  if (isValid.length == mentorFieldsSelector.length) {
     submitInput.disabled = false;
     submitInput.classList.remove('disabled');
   } else {