diff --git a/languages/en_CA.json b/languages/en_CA.json
index 0b012339..d64a18b0 100644
--- a/languages/en_CA.json
+++ b/languages/en_CA.json
@@ -1265,6 +1265,14 @@
    "Objects to look for": "Objects to look for",
    "Common Objects": "Common Objects",
    "Uncommon Objects": "Uncommon Objects",
+   "SMTP Server": "SMTP Server",
+   "SMTP Port": "SMTP Port",
+   "Sender Name": "Sender Name",
+   "Sender Address": "Sender Address",
+   "Sender Password": "Sender Password",
+   "Send Emails to": "Send Emails to",
+   "EnableSSLorTLS": "Enable SSL or TLS",
+   "SendEmailstoText": "Leave blank to send to current account email.",
    "person": "person",
    "bicycle": "bicycle",
    "car": "car",
diff --git a/libs/notifications/email.js b/libs/notifications/email.js
index ad97cd32..43f04239 100644
--- a/libs/notifications/email.js
+++ b/libs/notifications/email.js
@@ -3,6 +3,7 @@ const {
     template,
     checkEmail,
 } = require("./emailUtils.js")
+const nodeMailer = require('nodemailer')
 module.exports = function(s,config,lang,getSnapshot){
     const {
         getEventBasedRecordingUponCompletion,
@@ -11,11 +12,53 @@ module.exports = function(s,config,lang,getSnapshot){
     try{
         if(config.mail){
             if(config.mail.from === undefined){config.mail.from = '"ShinobiCCTV" <no-reply@shinobi.video>'}
-            s.nodemailer = require('nodemailer').createTransport(config.mail);
+            s.nodemailer = nodeMailer.createTransport(config.mail);
         }
         const sendMessage = (...args) => {
             return s.nodemailer.sendMail(...args)
         }
+        function buildNodeMailerConfig(options){
+            return {
+              host: options.host,
+              port: options.port,
+              secure: options.secure, // upgrade later with STARTTLS
+              auth: {
+                user: options.auth.user,
+                pass: options.auth.pass,
+              },
+              tls: {
+                  rejectUnauthorized: false,
+              },
+            }
+        }
+        function getNodeMailerByUser(user){
+            const userDetails = user.details
+            // auth >
+            const smtpServer = userDetails.email_smtp_server
+            const smtpPort = parseInt(userDetails.email_smtp_port) || 587
+            const smtpSecure = userDetails.email_enable_tls === '0' ? false : true
+            const smtpSenderAddress = userDetails.email_sender_address
+            const smtpSenderPassword = userDetails.email_sender_password
+            // auth />
+            const emailSenderName = userDetails.email_sender_name
+            const emailSendTo = userDetails.email_send_to
+            if(smtpServer && smtpSenderAddress && smtpSenderPassword){
+                if(!s.group[user.ke].nodemailerTransport){
+                    s.group[user.ke].nodemailerTransport = nodeMailer.createTransport(buildNodeMailerConfig({
+                        host: smtpServer,
+                        port: smtpPort,
+                        secure: smtpSecure,
+                        auth: {
+                            user: smtpSenderAddress,
+                            pass: smtpSenderPassword,
+                        }
+                    }))
+                }
+                return s.group[user.ke].nodemailerTransport
+            }else{
+                return s.nodemailer
+            }
+        }
         const onDetectorNoTriggerTimeoutForEmail = function(e){
             //e = monitor object
             if(config.mail && e.details.detector_notrigger_mail === '1'){
@@ -240,7 +283,7 @@ module.exports = function(s,config,lang,getSnapshot){
         s.onFilterEvent(onFilterEventForEmail)
         s.onDetectorNoTriggerTimeout(onDetectorNoTriggerTimeoutForEmail)
         s.onMonitorUnexpectedExit(onMonitorUnexpectedExitForEmail)
-        s.definitions["Event Filters"].blocks["Action for Selected"].info.push(                    {
+        s.definitions["Event Filters"].blocks["Action for Selected"].info.push({
           "name": "actions=mail",
           "field": "Email on Trigger",
           "fieldType": "select",