diff --git a/apps/maarch_entreprise/class/class_contacts_v2_Abstract.php b/apps/maarch_entreprise/class/class_contacts_v2_Abstract.php
index c40f823cc131ee105d719cf09d3460c11f30152e..2b77a69cdcb9e9adca49ad805508583d74c938c1 100755
--- a/apps/maarch_entreprise/class/class_contacts_v2_Abstract.php
+++ b/apps/maarch_entreprise/class/class_contacts_v2_Abstract.php
@@ -202,6 +202,7 @@ abstract class contacts_v2_Abstract extends Database
     public function addupcontact($mode, $admin = true, $confirm = 'N', $mycontact = 'N')
     {
         $db = new Database();
+        
         // add ou modify users in the database
         if ($confirm == 'N') {
             $this->contactinfo($mode);
@@ -445,6 +446,12 @@ abstract class contacts_v2_Abstract extends Database
     public function formcontact($mode, $id = '', $admin = true, $iframe = false)
     {
         $db = new Database();
+
+        // usefull for fields important
+        $ContactFillingModel = new \Contact\models\ContactFillingModel();
+        $contactsFilling = $ContactFillingModel::get();
+        $contactsFilling['rating_columns'] = $contactsFilling['rating_columns'];
+        
         $display_value = 'table-row';
 
         $func = new functions();
@@ -944,22 +951,11 @@ abstract class contacts_v2_Abstract extends Database
                 } ?>
         </p>
     </form>
-    <?php
-        $ContactFillingModel = new \Contact\models\ContactFillingModel();
-        $contactsFilling = $ContactFillingModel::get();
-        $contactsFilling['rating_columns'] = $contactsFilling['rating_columns'];
-    ?>
+    
     <script type="text/javascript">
         var fieldsCtrl = <?php echo $contactsFilling['rating_columns']; ?>;
-        var elements = document.getElementById("frmcontact").elements;
-        for (var i = 0, element; element = elements[i++];) {
-            for (var j = 0, fieldsCtrlElem; fieldsCtrlElem = fieldsCtrl[j++];) {
-                if (element.name === fieldsCtrlElem) {
-                    element.style.borderColor = "green";
-                    element.style.borderWidth = "2px";
-                }
-            }
-        }
+        contactMapping(fieldsCtrl, "frmcontact");
+        
         var isChecked = false;
         if (!checkContactType('no_corporate', '<?php echo $can_add_contact; ?>')) {
             $j('#span_no_corporate').css('display', 'none');
@@ -1300,6 +1296,12 @@ abstract class contacts_v2_Abstract extends Database
     public function formaddress($mode, $id = '', $admin = true, $iframe = '')
     {
         $db = new Database();
+
+        // usefull for fields important
+        $ContactFillingModel = new \Contact\models\ContactFillingModel();
+        $contactsFilling = $ContactFillingModel::get();
+        $contactsFilling['rating_columns'] = $contactsFilling['rating_columns'];
+
         $display_value = 'table-row';
         $func = new functions();
         $state = true;
@@ -2080,24 +2082,9 @@ abstract class contacts_v2_Abstract extends Database
     </p>
 </form>
 
-    <?php
-        $ContactFillingModel = new \Contact\models\ContactFillingModel();
-        $contactsFilling = $ContactFillingModel::get();
-        $contactsFilling['rating_columns'] = $contactsFilling['rating_columns'];
-    ?>
     <script type="text/javascript">
         var fieldsCtrl = <?php echo $contactsFilling['rating_columns']; ?>;
-        var elements = document.getElementById("frmcontact").elements;
-        console.log(fieldsCtrl);
-        for (var i = 0, element; element = elements[i++];) {
-            for (var j = 0, fieldsCtrlElem; fieldsCtrlElem = fieldsCtrl[j++];) {
-                console.log(element.name);
-                if (element.name === fieldsCtrlElem) {
-                    element.style.borderColor = "green";
-                    element.style.borderWidth = "2px";
-                }
-            }
-        }
+        contactMapping(fieldsCtrl, "frmcontact");
     </script>
 
 <?php
diff --git a/apps/maarch_entreprise/js/functions.js b/apps/maarch_entreprise/js/functions.js
index dd612c04c3e7f3d0bbaaeb10c4ed4b67a65b9272..a6d23ced39ed1d5a7997599ca6ffa68552d3f417 100755
--- a/apps/maarch_entreprise/js/functions.js
+++ b/apps/maarch_entreprise/js/functions.js
@@ -3813,4 +3813,55 @@ function writeLocationBar(path,label,level) {
         var separator = $j('<span> > </span>');
         separator.insertBefore(elem);
     }    
+}
+
+function contactMapping(fieldsCtrl, formId) {
+    for (var j = 0, fieldsCtrlElem; fieldsCtrlElem = fieldsCtrl[j++];) {
+        if (fieldsCtrlElem === "department") {
+            fieldsCtrl[j-1] = "departement";
+        }
+        if (fieldsCtrlElem === "address_complement") {
+            fieldsCtrl[j-1] = "add_comp";
+        }
+        if (fieldsCtrlElem === "address_num") {
+            fieldsCtrl[j-1] = "num";
+        }
+        if (fieldsCtrlElem === "address_street") {
+            fieldsCtrl[j-1] = "street";
+        }
+        if (fieldsCtrlElem === "address_postal_code") {
+            fieldsCtrl[j-1] = "cp";
+        }
+        if (fieldsCtrlElem === "address_town") {
+            fieldsCtrl[j-1] = "town";
+        }
+        if (fieldsCtrlElem === "address_country") {
+            fieldsCtrl[j-1] = "country";
+        }
+        if (fieldsCtrlElem === "email") {
+            fieldsCtrl[j-1] = "mail";
+        }
+        if (fieldsCtrlElem === "add_comp") {
+            fieldsCtrl[j-1] = "comp_data";
+        }
+        if (fieldsCtrlElem === "other_data") {
+            fieldsCtrl[j-1] = "comp_data";
+        }
+    }
+    var elements = document.getElementById(formId).elements;
+    // console.log(fieldsCtrl);
+    // console.log(elements);
+    for (var i = 0, element; element = elements[i++];) {
+        for (var j = 0, fieldsCtrlElem; fieldsCtrlElem = fieldsCtrl[j++];) {
+            if (element.name === fieldsCtrlElem) {
+                //console.log("ok : "+element.name);
+                element.style.borderWidth = "2px";
+                if (element.value !== '') {
+                    element.style.borderColor = "green";
+                } else {
+                    element.style.borderColor = "orange";
+                }
+            }
+        }
+    }
 }
\ No newline at end of file