diff --git a/APPL/PDA/melding.asp b/APPL/PDA/melding.asp
index a33a6225f0..895be9ea63 100644
--- a/APPL/PDA/melding.asp
+++ b/APPL/PDA/melding.asp
@@ -825,23 +825,19 @@ if (action != "forward")
 
             ROFIELD("fld", L("lcl_txt"), mld_info.mld_omschr, {multi: true});
 
-            if (mld_info.mprio != 3) {
-                ROFIELD("attention", L("lcl_mld_urg"), mld.getpriotext(mld_info.mprio));
-            }
-            if (mld_info.mld_behandelgroep_key > 0)
+            if (mld_info.mprio != 3)
             {
-                sql = "SELECT mld_behandelgroep_naam"
-                    + "  FROM mld_behandelgroep"
-                    + " WHERE mld_behandelgroep_key = " + mld_info.mld_behandelgroep_key;
-                oRs = Oracle.Execute( sql );
-                ROFIELD("fld", L("mld_behandelgroep"), oRs("mld_behandelgroep_naam").Value, { suppressEmpty: true });
-                oRs.Close();
+                ROFIELD("attention", L("lcl_mld_urg"), mld.getpriotext(mld_info.mprio));
             }
             if (mld_info.behandel_key > 0)
             {
                 var prs_behandelaar = new Perslid(mld_info.behandel_key);
                 ROFIELD((mld_info.behandel_key != user_key ?"attention":"fld"), L("lcl_mld_behandelaar"), prs_behandelaar.naam(), { suppressEmpty: true });
             }
+            if (mld_info.mld_ins_discipline_key > 0)
+            {
+                ROFIELD("fld", L("mld_ins_discipline"), (mld_info.mld_srtins_prefix ? mld_info.mld_srtins_prefix + "-" : "") + mld_info.mld_ins_discipline_omschrijving);
+            }
             if (mld_info.behandel2_key > 0)
             {
                 var prs_behandelaar2 = new Perslid(mld_info.behandel2_key);
@@ -1042,7 +1038,7 @@ if (action != "forward")
           var hasParent = mld_info.parent_key != null;              // dan geen opdrachten of bestellingen
           if (!hasParent && mfe.canReadAny) // Mocht ik geen leesrechten hebben, dan ook de opdrachten en bestellingen niet tonen.
           {
-            var this_opdr = mld.func_enabled_mld(mld_info.disc, "D"); // wat mag ik zoal op een nieuwe melding
+            var this_opdr = mld.func_enabled_mld(mld_info.aut_disc_arr, "D"); // wat mag ik zoal op een nieuwe melding
             if ((this_opdr.canORDBOFread) && showord)
             {
               opdr_page = rooturl+"/appl/pda/orders_list.asp?mld_key="+mld_key+"&urole=" + (this_opdr.canORDBOFread? "bo" : urole);
@@ -1142,19 +1138,6 @@ if (action == "forward")
               <input type="hidden" id="loc_key" name="loc_key" value="<%=mld_info.loc_key%>">
 <%
             }
-            if (mld_info.mld_behandelgroep_key > 0 || this_mld.canAfhandChange)
-            {
-              sql = "SELECT mld_behandelgroep_key, mld_behandelgroep_naam"
-                  + "  FROM mld_behandelgroep"
-                  + " ORDER BY 2, 1";
-
-              FCLTselector("mld_behandelgroep", sql,
-                          {  label: L("mld_behandelgroep"),
-                             initKey: mld_info.mld_behandelgroep_key,
-                             emptyOption: "",
-                             readonly: !this_mld.canAfhandChange
-                          });
-            }
             FCLTpersoonselector("sBehandel",
                         "sgBehandelaar",
                         { perslidKey: S("mld_forward_auto_fill") ? mld_info.behandel_key : null,
@@ -1164,38 +1147,14 @@ if (action == "forward")
                           urlAdd: urlAdd,
                           filtercode: (mld_info.mld_status == 0 ? "BEHF" : "BEHB")
                         });
-            if (S("mld_behandelaar2"))
-              FCLTpersoonselector("sBehandel2",
-                          "sgBehandelaar",
-                          { perslidKey: S("mld_forward_auto_fill") ? mld_info.behandel2_key : null,
-                            idadd: 2,
-                            label: L("lcl_mld_behandelaar2"),
-                            autlevel: this_mld.authparams(autfunction) && this_mld.authparams(autfunction).PRSwritelevel,
-                            urlAdd: urlAdd,
-                            filtercode: (mld_info.mld_status == 0 ? "BH2F" : "BH2B")
-                          });
           }
           else
           {
-            if (mld_info.mld_behandelgroep_key > 0)
-            {
-                sql = "SELECT mld_behandelgroep_naam"
-                    + "  FROM mld_behandelgroep"
-                    + " WHERE mld_behandelgroep_key = " + mld_info.mld_behandelgroep_key;
-                oRs = Oracle.Execute( sql );
-                ROFIELD("fld", L("mld_behandelgroep"), oRs("mld_behandelgroep_naam").Value, { suppressEmpty: true });
-                oRs.Close();
-            }
             if (mld_info.behandel_key > 0)
             {
                 var prs_behandelaar = new Perslid(mld_info.behandel_key);
                 ROFIELD((mld_info.behandel_key != user_key ?"attention":"fld"), L("lcl_mld_behandelaar") , prs_behandelaar.naam(), {suppressEmpty: true });
             }
-            if (S("mld_behandelaar2") && mld_info.behandel2_key > 0)
-            {
-                var prs_behandelaar2 = new Perslid(mld_info.behandel2_key);
-                ROFIELD((mld_info.behandel2_key != user_key ?"attention":"fld"), L("lcl_mld_behandelaar2") , prs_behandelaar2.naam(), {suppressEmpty: true });
-            }
           }
 
           RWFIELD("opmerk", L("lcl_mld_inf_Opmerking"), "", {multi: true, pclass: ((S("mld_forward_opm_flags") & 1) == 1? " required" : "")});
@@ -1517,19 +1476,6 @@ if (mld_key > -1 && this_mld.canAccept)
         // Behandelaar
         if (this_mld.canBOwrite || this_mld.canFOwrite)
         {
-          if (mld_info.mld_behandelgroep_key > 0 || this_mld.canAfhandChange)
-          {
-            sql = "SELECT mld_behandelgroep_key, mld_behandelgroep_naam"
-                + "  FROM mld_behandelgroep"
-                + " ORDER BY 2, 1";
-
-            FCLTselector("mld_behandelgroep", sql,
-                        {  label: L("mld_behandelgroep"),
-                           initKey: mld_info.mld_behandelgroep_key,
-                           emptyOption: "",
-                           readonly: !this_mld.canAfhandChange
-                        });
-          }
 %>
           <input type="hidden" id="prs_key"  name="prs_key"  value="<%=mld_info.melder_key%>">
           <input type="hidden" id="disc_key" name="disc_key" value="<%=mld_info.disc%>">
@@ -1549,16 +1495,6 @@ if (mld_key > -1 && this_mld.canAccept)
                         urlAdd: urlAdd,
                         filtercode: (mld_info.mld_status == 0 ? "BEHF" : "BEHB")
                       });
-
-          if (S("mld_behandelaar2"))
-            FCLTpersoonselector("sBehandel2",
-                        "sgBehandelaar",
-                        { idadd: 2,
-                          label: L("lcl_mld_behandelaar2"),
-                          autlevel: this_mld.authparams(autfunction) && this_mld.authparams(autfunction).PRSwritelevel,
-                          urlAdd: urlAdd,
-                          filtercode: (mld_info.mld_status == 0 ? "BH2F" : "BH2B")
-                        });
         }
 
         // Reden accepteren