diff --git a/scripts/locales/en.lua b/scripts/locales/en.lua
index 2930b9a428..9addcbe22f 100644
--- a/scripts/locales/en.lua
+++ b/scripts/locales/en.lua
@@ -2039,10 +2039,14 @@ local lang = {
     ["dynamic_interfaces_creation_title"] = "Disaggregation Criterion",
     ["dynamic_network_interfaces"] = "Dynamic Network Interfaces",
     ["email_notification"] = "Email Notification",
-    ["email_notification_address_description"] = "The sender/recipient email address to use.",
-    ["email_notification_address_title"] = "Email Address",
+    ["email_notification_recipient_description"] = "The recipient email address.",
+    ["email_notification_recipient_title"] = "Recipient",
+    ["email_notification_sender_description"] = "The sender email address.",
+    ["email_notification_sender_title"] = "Sender",
     ["email_notification_server_description"] = "The SMTP server to deliver the email. E.g. smtp://example.com:25 .",
     ["email_notification_server_title"] = "SMTP Server",
+    ["email_send_error"] = "Email send error. Check out the %{product} log for more details.",
+    ["email_sent_successfully"] = "Email sent successfully",
     ["errors"] = "Errors",
     ["errors_and_warnings"] = "Errors and Warnings",
     ["ewma_alpha_percent_description"] = "Exponentially Weighted Moving Average (EWMA) alpha coefficient, expressed as a percentage. Used to estimate Autonomous Systems round-trip time.",
@@ -2149,6 +2153,7 @@ local lang = {
     ["secondary_dns_description"] = "A fallback DNS server to use when the global primary DNS server is not available.",
     ["secondary_dns_title"] = "Global Secondary DNS",
     ["security_alerts"] = "Security Alerts",
+    ["send_test_mail"] = "Send Test Email",
     ["sender_username_description"] = "Set the username of the sender of slack notifications",
     ["sender_username_title"] = "Notification Sender Username",
     ["simple_view"] = "Simple View",
diff --git a/scripts/lua/admin/prefs.lua b/scripts/lua/admin/prefs.lua
index 522a27c121..b4f740912c 100644
--- a/scripts/lua/admin/prefs.lua
+++ b/scripts/lua/admin/prefs.lua
@@ -21,6 +21,8 @@ sendHTTPContentTypeHeader('text/html')
 
 local show_advanced_prefs = false
 local alerts_disabled = false
+local message_info = ""
+local message_severity = "alert-warning"
 
 if(haveAdminPrivileges()) then
    if(_POST["flush_alerts_data"] ~= nil) then
@@ -29,6 +31,19 @@ if(haveAdminPrivileges()) then
    elseif(_POST["disable_alerts_generation"] == "1") then
     require "alert_utils"
     disableAlertsGeneration()
+   elseif(_POST["send_test_email"] ~= nil) then
+    local email_utils = require("email_utils")
+
+    local product = ntop.getInfo(false).product
+    local success = email_utils.sendEmail(product .. " TEST MAIL", "Email notification is working")
+
+    if success then
+      message_info = i18n("prefs.email_sent_successfully")
+      message_severity = "alert-success"
+    else
+      message_info = i18n("prefs.email_send_error", {product=product})
+      message_severity = "alert-danger"
+    end
    end
 
    ntop.dumpFile(dirs.installdir .. "/httpdocs/inc/header.inc")
@@ -38,6 +53,13 @@ if(haveAdminPrivileges()) then
 
    prefs = ntop.getPrefs()
 
+if not isEmptyString(message_info) then
+  print[[<div class="alert ]] print(message_severity) print[[" role="alert">]]
+  print[[<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>]]
+  print(message_info)
+  print[[</div>]]
+end
+
    print [[
 	    <h2>Runtime Preferences</h2>
       ]]
@@ -347,7 +369,7 @@ function printExternalAlertsReport()
      if ntop.sendMail then -- only if sendmail is defined, and thus, supported
 	print('<tr><th colspan="2" class="info">'..i18n("prefs.email_notification")..'</th></tr>')
 	
-	local elementToSwitch = {"row_email_notification_severity_preference", "email_address", "smtp_server"}
+	local elementToSwitch = {"row_email_notification_severity_preference", "email_sender", "email_recipient", "smtp_server", "alerts_test"}
 
 	prefsToggleButton({
 	      field = "toggle_email_notification",
@@ -372,10 +394,16 @@ function printExternalAlertsReport()
 			     "ntopng.prefs.alerts.", "smtp_server",
 			     "", "url", showElements and showEmailNotificationPrefs, false, true, {attributes={spellcheck="false"}, required=true})
 
-	prefsInputFieldPrefs(subpage_active.entries["email_notification_address"].title, subpage_active.entries["email_notification_address"].description,
-			     "ntopng.prefs.alerts.", "email_address",
+	prefsInputFieldPrefs(subpage_active.entries["email_notification_sender"].title, subpage_active.entries["email_notification_sender"].description,
+			     "ntopng.prefs.alerts.", "email_sender",
 			     "", "email", showElements and showEmailNotificationPrefs, false, nil, {attributes={spellcheck="false"}, required=true})
-     end
+
+	prefsInputFieldPrefs(subpage_active.entries["email_notification_recipient"].title, subpage_active.entries["email_notification_recipient"].description,
+			     "ntopng.prefs.alerts.", "email_recipient",
+			     "", "email", showElements and showEmailNotificationPrefs, false, nil, {attributes={spellcheck="false"}, required=true})
+
+  print('<tr id="alerts_test"><td><button class="btn btn-default disable-on-dirty" type="button" onclick="sendTestEmail();" style="width:230px; float:left;">'..i18n("prefs.send_test_mail")..'</button></td></tr>')
+     end -- ntop.sendMail
 
      print('<tr><th colspan=2 class="info"><i class="fa fa-slack" aria-hidden="true"></i> '..i18n('prefs.slack_integration')..'</th></tr>')
 
@@ -447,6 +475,18 @@ function printExternalAlertsReport()
   print('</table>')
   print [[<input id="csrf" name="csrf" type="hidden" value="]] print(ntop.getRandomCSRFValue()) print [[" />
   </form> ]]
+
+  print[[<script>
+    function sendTestEmail() {
+      var params = {};
+
+      params.send_test_email = "";
+      params.csrf = "]] print(ntop.getRandomCSRFValue()) print[[";
+
+      var form = paramsToForm('<form method="post"></form>', params);
+      form.appendTo('body').submit();
+    }
+  </script>]]
 end
 
 -- ================================================================================
@@ -1274,7 +1314,9 @@ print[[
    dofile(dirs.installdir .. "/scripts/lua/inc/footer.lua")
 
    print([[<script>
-aysHandleForm("form");
+aysHandleForm("form", {
+  disable_on_dirty: '.disable-on-dirty',
+});
 
 /* Use the validator plugin to override default chrome bubble, which is displayed out of window */
 $("form[id!='search-host-form']").validator({disable:true});
diff --git a/scripts/lua/modules/email_utils.lua b/scripts/lua/modules/email_utils.lua
index 6ded9c0b10..057813682c 100644
--- a/scripts/lua/modules/email_utils.lua
+++ b/scripts/lua/modules/email_utils.lua
@@ -19,22 +19,38 @@ local function getEmailMessage(now_ts, from, to, subject, body)
   return table.concat(lines, "\r\n") .. "\r\n\r\n" .. body .. "\r\n"
 end
 
-function email.sendNotification(notif)
-  local email_address = ntop.getPref("ntopng.prefs.alerts.email_address")
+function email.sendEmail(subject, message_body)
   local smtp_server = ntop.getPref("ntopng.prefs.alerts.smtp_server")
-  local msg_prefix = alertNotificationActionToLabel(notif.action)
+  local from_addr = ntop.getPref("ntopng.prefs.alerts.email_sender")
+  local to_addr = ntop.getPref("ntopng.prefs.alerts.email_recipient")
 
-  if isEmptyString(email_address) or isEmptyString(smtp_server) then
+  if isEmptyString(from_addr) or isEmptyString(to_addr) or isEmptyString(smtp_server) then
     return false
   end
 
+  if not string.find(smtp_server, "://") then
+    smtp_server = "smtp://" .. smtp_server
+  end
+
+  local parts = string.split(to_addr, "@")
+
+  if #parts == 2 then
+    local sender_domain = parts[2]
+    smtp_server = smtp_server .. "/" .. sender_domain
+  end
+
+  local message = getEmailMessage(os.time(), from_addr, to_addr, subject, message_body)
+
+  return ntop.sendMail(from_addr, to_addr, message, smtp_server)
+end
+
+function email.sendNotification(notif)
+  local msg_prefix = alertNotificationActionToLabel(notif.action)
   local product = ntop.getInfo(false).product
   local subject = product .. " [" .. string.upper(notif.severity) .. "]: " .. alertTypeLabel(alertType(notif.type), true)
   local message_body = noHtml(msg_prefix .. notif.message)
-  local from_to = email_address
-  local message = getEmailMessage(os.time(), from_to, from_to, subject, message_body)
 
-  return ntop.sendMail(from_to, from_to, message, smtp_server)
+  return email.sendEmail(subject, message_body)
 end
 
 return email
diff --git a/scripts/lua/modules/http_lint.lua b/scripts/lua/modules/http_lint.lua
index a4b4dac0cc..7ac3aafbfb 100644
--- a/scripts/lua/modules/http_lint.lua
+++ b/scripts/lua/modules/http_lint.lua
@@ -1012,7 +1012,8 @@ local known_parameters = {
    ["global_dns"]                                  =  validateEmptyOr(validateIPV4),
    ["secondary_dns"]                               =  validateEmptyOr(validateIPV4),
    ["redirection_url"]                             =  validateEmptyOr(validateSingleWord),
-   ["email_address"]                               =  validateSingleWord,
+   ["email_sender"]                                =  validateSingleWord,
+   ["email_recipient"]                             =  validateSingleWord,
    ["smtp_server"]                                 =  validateSingleWord,
 
    -- Multiple Choice
@@ -1033,6 +1034,7 @@ local known_parameters = {
 
    -- Other
    ["flush_alerts_data"]                           =  validateEmpty,
+   ["send_test_email"]                             =  validateEmpty,
    ["network_discovery_interval"]                  =  validateNumber,
 --
 
diff --git a/scripts/lua/modules/prefs_menu.lua b/scripts/lua/modules/prefs_menu.lua
index 1678e24949..6b760ddb06 100644
--- a/scripts/lua/modules/prefs_menu.lua
+++ b/scripts/lua/modules/prefs_menu.lua
@@ -183,9 +183,13 @@ local menu_subpages = {
       title       = i18n("prefs.toggle_email_notification_title"),
       description = i18n("prefs.toggle_email_notification_description"),
     },
-    email_notification_address = {
-      title       = i18n("prefs.email_notification_address_title"),
-      description = i18n("prefs.email_notification_address_description"),
+    email_notification_sender = {
+      title       = i18n("prefs.email_notification_sender_title"),
+      description = i18n("prefs.email_notification_sender_description"),
+    },
+    email_notification_recipient = {
+      title       = i18n("prefs.email_notification_recipient_title"),
+      description = i18n("prefs.email_notification_recipient_description"),
     },
     email_notification_server = {
       title       = i18n("prefs.email_notification_server_title"),
diff --git a/src/Utils.cpp b/src/Utils.cpp
index 85716fe79b..9e47be2c60 100755
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -1233,10 +1233,12 @@ bool Utils::sendMail(char *from, char *to, char *message, char *smtp_server) {
 
     res = curl_easy_perform(curl);
 
-    if(res != CURLE_OK)
+    if(res != CURLE_OK) {
       ntop->getTrace()->traceEvent(TRACE_WARNING,
-				   "Unable to send email to (%s): %s",
+				   "Unable to send email to (%s): %s. Run ntopng with -v6 for more details.",
 				   smtp_server, curl_easy_strerror(res));
+      ret = false;
+    }
 
     curl_slist_free_all(recipients);