diff --git a/APPL/Shared/Shared.inc b/APPL/Shared/Shared.inc
index 973b00d28e..f4b5577fa3 100644
--- a/APPL/Shared/Shared.inc
+++ b/APPL/Shared/Shared.inc
@@ -875,6 +875,51 @@ safe = {
         var safehtml = safe.html(waarde); // Let op: vervangt *alle* \n door <br>. Dat gaan we deels later nog terugdraaien
                                           // We hebben het wel *nodig* omdat .* niet over meerdere regels werkt (hoewel dat
                                           // weer oplosbaar schijnt te zijn met [\s\S])
+
+        /* Checking for [link] url (|optionaltext) [/link] */
+        var strre = "\\[link\\](.*?)\\[\\/link\\]";
+        var re = new RegExp(strre, "g");
+        var matched = safehtml.match(re);
+        if (matched != null)
+        {
+          var url = "";
+          var label = "";
+          for (var i = 0; i < matched.length; i++)
+          {
+            if (matched[i].match(re)) // om RegExp.$1 te bepalen
+            {
+              var result = RegExp.$1.split("|");
+              if (result.length > 0)
+              {
+                url = result[0];
+                if (result.length > 2)
+                {
+                  result.shift();
+                  label = result.join("|");
+                }
+                else if (result.length == 2)
+                  label = result[1];
+                else
+                  label = result[0];
+                safehtml = safehtml.replace(matched[i], "<a href=\"" + safe.htmlattr(url) + "\" target=\"_blank\" rel=\"noopener noreferrer\">" + safe.fclthtml(label) + "</a>");
+              }
+            }
+          }
+        }
+
+        /* Checking for [img] src [/img] */
+        strre = "\\[img\\](.*?)\\[\\/img\\]";
+        re = new RegExp(strre, "g");
+        matched = safehtml.match(re);
+        if (matched != null)
+        {
+          for (var i = 0; i < matched.length; i++)
+          {
+            if (matched[i].match(re)) // om RegExp.$1 te bepalen
+              safehtml = safehtml.replace(matched[i], "<img src=\"" + safe.htmlattr(RegExp.$1) + "\" class=\"customImg\">");
+          }
+        }
+
         for (var i = 0; i < safepairs.length; i++)
         {
             var code = safepairs[i];
diff --git a/APPL/Shared/default.csx b/APPL/Shared/default.csx
index 187c99a217..59272f2e6d 100644
--- a/APPL/Shared/default.csx
+++ b/APPL/Shared/default.csx
@@ -3217,6 +3217,7 @@ body.likemodal {
 #mod_res_selectroom {min-width:600px;}
 #mod_resmulti_save {min-width:500px;}
 #mod_insmultiedit {min-width:500px;height:250px;}
+#mod_insxcpmultiedit {min-width:500px;height:250px;}
 #mod_insxcp {min-width:800px;}
 #mod_mldobj {min-width:900px;}
 body.mod_edit_mandate {min-width:500px;}
@@ -4771,7 +4772,10 @@ div.menuSpacer {
         margin-top:10%;
     }
 }
-
 select[multiple]#authorizationgroup {
    height: 150px;
+}
+img.customImg {
+   max-height: 800px;
+   max-width: 600px;
 }
\ No newline at end of file