diff --git a/definitions/en_CA.js b/definitions/en_CA.js
index 442921af..ce385e99 100644
--- a/definitions/en_CA.js
+++ b/definitions/en_CA.js
@@ -2513,7 +2513,6 @@ module.exports = function(s,config,lang){
                       "description": "The amount of time until a trigger is allowed to send another email with motion details and another image.",
                       "default": "10",
                       "example": "",
-                      "form-group-class": "h_det_email_input h_det_email_1",
                       "form-group-class-pre-layer": "h_det_input h_det_1",
                       "possible": ""
                    },
diff --git a/libs/events.js b/libs/events.js
index 4cd4fc78..43c26792 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -183,15 +183,15 @@ module.exports = function(s,config,lang){
             indifference : false,
             countObjects : true
         }
-        s.onEventTriggerBeforeFilterExtensions.forEach(function(extender){
-            extender(d,filter)
-        })
         var detailString = JSON.stringify(d.details);
         if(!s.group[d.ke]||!s.group[d.ke].activeMonitors[d.id]){
             return s.systemLog(lang['No Monitor Found, Ignoring Request'])
         }
         d.mon=s.group[d.ke].rawMonitorConfigurations[d.id];
         var currentConfig = s.group[d.ke].rawMonitorConfigurations[d.id].details
+        s.onEventTriggerBeforeFilterExtensions.forEach(function(extender){
+            extender(d,filter)
+        })
         var hasMatrices = (d.details.matrices && d.details.matrices.length > 0)
         //read filters
         if(
diff --git a/libs/notification.js b/libs/notification.js
index 2d131e7e..73cb66db 100644
--- a/libs/notification.js
+++ b/libs/notification.js
@@ -275,10 +275,14 @@ module.exports = function(s,config,lang){
             }
         }
         var onEventTriggerBeforeFilterForEmail = function(d,filter){
-            filter.mail = true
+            if(d.mon.details.detector_mail === '1'){
+                filter.mail = true
+            }else{
+                filter.mail = false
+            }
         }
         var onEventTriggerForEmail = function(d,filter){
-            if(filter.mail && config.mail && !s.group[d.ke].activeMonitors[d.id].detector_mail && d.mon.details.detector_mail === '1'){
+            if(filter.mail && config.mail && !s.group[d.ke].activeMonitors[d.id].detector_mail){
                 s.sqlQuery('SELECT mail FROM Users WHERE ke=? AND details NOT LIKE ?',[d.ke,'%"sub"%'],function(err,r){
                     r=r[0];
                     var detector_mail_timeout