diff --git a/APPL/API2/model_ins_srtcontrole.inc b/APPL/API2/model_ins_srtcontrole.inc
index 675ba6bea6..062bf2d647 100644
--- a/APPL/API2/model_ins_srtcontrole.inc
+++ b/APPL/API2/model_ins_srtcontrole.inc
@@ -209,7 +209,8 @@ function model_ins_srtcontrole()
             "label": L("ins_srtcontrole_eind"),
             "typ": "date",
             "multiedit": true,
-            "track": true
+            "track": true,
+            "onchange": "DateChangedEnddate()"
         },
         "phasingouttime": {
             "dbs": "ins_srtcontrole_afbouwtijd",
@@ -248,7 +249,9 @@ function model_ins_srtcontrole()
             "dbs": "mld_stdmelding_key",
             "label": L("mld_stdmelding_key"),
             "typ": "key",
-            "foreign": "mld_stdmelding"
+            "foreign": "mld_stdmelding",
+            "multiedit": true,
+            "track": true
         },
         "options": {
             "dbs": "ins_srtcontrole_options",
diff --git a/APPL/MGT/ins_srtcontrole.js b/APPL/MGT/ins_srtcontrole.js
index 9ddae63dce..928723f8e0 100644
--- a/APPL/MGT/ins_srtcontrole.js
+++ b/APPL/MGT/ins_srtcontrole.js
@@ -70,6 +70,15 @@ function change_ctr_discipline(init)
     }
 }
 
+function DateChangedEnddate()
+{
+  if ($("#show_enddate").is(":checkbox"))
+    var isgevuld = $("#show_enddate").is(":checked")
+  else
+    var isgevuld = $("#show_enddate").val();
+  $("input[type=checkbox][name=scf_multi_enddate]").prop("checked", isgevuld);
+}
+
 function SelectBits()
 {
     if (!validateForm("u2", { checkOnly: ["unit"] }))
diff --git a/APPL/SCF/scaffolding.inc b/APPL/SCF/scaffolding.inc
index 8abf5c85f5..112e57f34f 100644
--- a/APPL/SCF/scaffolding.inc
+++ b/APPL/SCF/scaffolding.inc
@@ -615,7 +615,8 @@ function scf_RWFIELDTR(model, fld, val, key, params)
                                 initTimeEmpty: !val,
                                 volgnr   : 1,
                                 required : params.required,
-                                autosize : field.autosize
+                                autosize : field.autosize,
+                                onChange : field.onchange
                               });
     else if (field.typ == "datetime")
             FCLTcalendar(fld, { label    : field.label,
diff --git a/APPL/SCF/scaffolding_edit.inc b/APPL/SCF/scaffolding_edit.inc
index ea27163805..af540db6ba 100644
--- a/APPL/SCF/scaffolding_edit.inc
+++ b/APPL/SCF/scaffolding_edit.inc
@@ -287,35 +287,6 @@ function scaffolding_edit(model, scf_params)
                   sethint();
               });
 
-<% if (multi) {
-	// Overal een vinkje voorzetten
-%>
-            $("input[type=text],input[type=checkbox],input[type=number],select").not(".fldtime").not(".processingtime").each(function() {
-                if ($(this).hasClass('flddate'))
-                    var cb_name = "scf_multi_" + $(this).attr("id").substr("show_".length);
-                else
-                    var cb_name = "scf_multi_" + $(this).attr("name");
-                var cb = $("<input type='checkbox'>").attr("name", cb_name);
-                var td = $("<td class='multi_cb'></td>").append(cb);
-                $(this).closest("tr").find("td.label").before(td);
-
-                // Zetten vinkje als je waarde invult
-                $(this).change(function () {
-                     if ($(this).is(":checkbox"))
-                        var isgevuld = $(this).is(":checked")
-                     else
-                        isgevuld = $(this).val();
-                     $("input[type=checkbox][name=" + cb_name + "]").prop("checked", isgevuld);
-                 });
-                // Wissen waarde als je vinkje weghaalt
-                cb.change(function (deze) {
-                            return function () {
-                                            if (!$(this).is(":checked"))
-                                                $(deze).val("");
-                                        }
-                                        }(this));
-            });
-<% } %>
             FcltMgr.resized(); // Indien labels over meer dan 1 regel staan.
           });
 
@@ -459,6 +430,81 @@ function scaffolding_edit(model, scf_params)
                 CreateButtons(buttons);
             IFACE.FORM_END();
     %>
+
+<% if (multi) {
+	// Overal een vinkje voorzetten
+%>
+        <script>
+          function putCheckmarkSuggest(prs_key, prs_txt, obj)
+          {
+            thisobj = $("#"+obj.suggestid);
+            if (thisobj.is(":checkbox"))
+              var isgevuld = thisobj.is(":checked")
+            else
+              var isgevuld = thisobj.val();
+
+            if (thisobj.hasClass("flddate"))
+              var cb_name = "scf_multi_" + thisobj.attr("id").substr("show_".length);
+            else if (thisobj.hasClass("suggest"))
+              var cb_name = "scf_multi_" + thisobj.attr("id").substr(0, thisobj.attr("id").length-5);
+            else
+              var cb_name = "scf_multi_" + thisobj.attr("name");
+            $("input[type=checkbox][name=" + cb_name + "]").prop("checked", isgevuld);
+            // Eventuele andere onChange acties van een selecter hieronder toevoegen.
+          };
+
+          $(function()
+          {
+            $("input[type=text],input[type=checkbox],input[type=number],input:not([type]),select, textarea").not(".fldtime").not(".processingtime").not("[class^='fldflex']").not("[class^='fldSflex']").each(function() {
+                if ($(this).hasClass('flddate'))
+                    var cb_name = "scf_multi_" + $(this).attr("id").substr("show_".length);
+                else if ($(this).hasClass("suggest"))
+                    var cb_name = "scf_multi_" + $(this).attr("id").substr(0, $(this).attr("id").length-5);
+                else
+                    var cb_name = "scf_multi_" + $(this).attr("name");
+                var cb = $("<input type='checkbox'>").attr("name", cb_name);
+                var td = $("<td class='multi_cb'></td>").append(cb);
+                $(this).closest("tr").find("td.label").before(td);
+
+                // Zetten vinkje als je waarde invult
+                if ($(this).hasClass('suggest'))
+                { // Suggest veld: Functie putCheckmarkSuggest() aan sgonchange koppelen.
+                  this.setAttribute("sgonchange", "putCheckmarkSuggest");
+                }
+                else if ($(this).hasClass("flddate"))
+                {
+                  // De FCLTcalendar vervaldatum heeft zijn eigen onChange functie die wordt aangeroepen.
+                  // Geen change functie aan het datum veld koppelen.
+                }
+                else
+                { // Andere velden dan suggest veld.
+                  $(this).change(function()
+                                 {
+                                   if ($(this).is(":checkbox"))
+                                     var isgevuld = $(this).is(":checked")
+                                   else
+                                     var isgevuld = $(this).val();
+                                   $("input[type=checkbox][name=" + cb_name + "]").prop("checked", isgevuld);
+                                 });
+                }
+
+                // Wissen waarde als je vinkje weghaalt
+                cb.change(function(deze) {
+                                           return function() {
+                                                               if (!$(this).is(":checked"))
+                                                                 $(deze).val("");
+                                                               else if ($(deze).hasClass("required"))
+                                                                 // Vinkje is aangevinkt en waarde is leeg.
+                                                                 // Als het veld verplicht is het vinkje er weer afhalen.
+                                                                 $(this).prop("checked", false);
+                                                             }
+                                         }(this));
+            });
+          });
+        </script>
+<% } %>
+
+
           </form>
         </div>
       </body>