diff --git a/CSUN/CSUN.sql b/CSUN/CSUN.sql
index 33edced1e..582acace6 100644
--- a/CSUN/CSUN.sql
+++ b/CSUN/CSUN.sql
@@ -543,32 +543,36 @@ CREATE OR REPLACE PROCEDURE csun_export_mailnoti (
 AS
    CURSOR c
    IS
-      SELECT DISTINCT
-             m.mld_melding_key,
-             COALESCE (
-                 (SELECT alg_onrgoedkenmerk_waarde
-                    FROM alg_onrgoedkenmerk aogk
-                   WHERE     alg_onrgoed_key = l.alg_locatie_key
-                         AND alg_kenmerk_key = 1260),   -- locatie spec. BB-er adres
-                 prs_perslid_email)
-                 prs_perslid_email
-        FROM prs_perslid                     p,
-             mld_melding                     m,
-             alg_locatie                     l,
-             alg_locatie                     l2,
-             prs_v_perslidwerkplek_gegevens  pwpg
-       WHERE     m.mld_alg_locatie_key = l.alg_locatie_key
-             AND m.mld_stdmelding_key != 41                   -- ontvangen berichten
-             AND pwpg.alg_locatie_key = l2.alg_locatie_key
-             AND l.alg_district_key = l2.alg_district_key
-             AND pwpg.prs_perslid_key = p.prs_perslid_key
-             AND p.prs_srtperslid_key = 32                                   -- BBer
-             AND p.prs_perslid_email IS NOT NULL
-             AND NOT EXISTS
-                     (SELECT fac_tracking_key
-                        FROM fac_tracking t
-                       WHERE     fac_tracking_oms LIKE 'Gemaild naar BBer:%'
-                             AND t.fac_tracking_refkey = mld_melding_key);
+      SELECT mld_melding_key, prs_perslid_email
+        FROM (SELECT m.mld_melding_key, alg_onrgoedkenmerk_waarde prs_perslid_email
+                FROM mld_melding  m,
+                     (SELECT alg_onrgoed_key, alg_onrgoedkenmerk_waarde
+                        FROM alg_onrgoedkenmerk aogk
+                       WHERE alg_kenmerk_key = 1260) lse
+               WHERE     m.mld_alg_locatie_key = lse.alg_onrgoed_key
+                     AND m.mld_stdmelding_key != 41           -- ontvangen berichten
+              UNION ALL
+              SELECT m.mld_melding_key, prs_perslid_email
+                FROM prs_perslid                     p,
+                     mld_melding                     m,
+                     alg_locatie                     l,
+                     alg_locatie                     l2,
+                     prs_v_perslidwerkplek_gegevens  pwpg,
+                     prs_kenmerklink                 kl
+               WHERE     m.mld_alg_locatie_key = l.alg_locatie_key
+                     AND m.mld_stdmelding_key != 41           -- ontvangen berichten
+                     AND pwpg.alg_locatie_key = l2.alg_locatie_key
+                     AND l.alg_district_key = l2.alg_district_key
+                     AND pwpg.prs_perslid_key = p.prs_perslid_key
+                     AND prs_kenmerk_key = 1100         -- notificatie enable vinkje
+                     AND fac.safe_to_number (prs_kenmerklink_waarde) = 1
+                     AND kl.prs_link_key = p.prs_perslid_key
+                     AND p.prs_perslid_email IS NOT NULL) g
+       WHERE NOT EXISTS
+                 (SELECT fac_tracking_key
+                    FROM fac_tracking t
+                   WHERE     fac_tracking_oms LIKE 'Gemaild naar BBer:%'
+                         AND t.fac_tracking_refkey = g.mld_melding_key);
 
    v_dummy   VARCHAR2 (128);
 BEGIN
@@ -608,8 +612,13 @@ BEGIN
    FOR rec IN c
    LOOP
       BEGIN
-         fac.putnotificationsrtprio(null, null, 'MLDMAI', rec.mld_melding_key, 'Melding ' || rec.mld_melding_key || ' is aan u in behandeling gegeven', 2, rec.prs_perslid_email, null, null, 2, null);
-         fac.trackaction('MLDMAI', rec.mld_melding_key, 4, NULL, 'Gemaild naar BBer: ' || rec.prs_perslid_email);
+         IF rec.prs_perslid_email IS NOT NULL
+         THEN
+            fac.putnotificationsrtprio(null, null, 'MLDMAI', rec.mld_melding_key, 'Melding ' || rec.mld_melding_key || ' is aan u in behandeling gegeven', 2, rec.prs_perslid_email, null, null, 2, null);
+            fac.trackaction('MLDMAI', rec.mld_melding_key, 4, NULL, 'Gemaild naar BBer: ' || rec.prs_perslid_email);
+         ELSE
+            fac.trackaction('MLDMAI', rec.mld_melding_key, 4, NULL, 'Gemaild naar BBer: <Geen info gevonden>');
+         END IF;
       END;
    END LOOP;
 END;