diff --git a/include/AlertsQueue.h b/include/AlertsQueue.h
index e9d7168f1f69..ff31f848f568 100644
--- a/include/AlertsQueue.h
+++ b/include/AlertsQueue.h
@@ -47,7 +47,7 @@ class AlertsQueue {
   void pushBroadcastDomainTooLargeAlert(const u_int8_t *src_mac,
                                         const u_int8_t *dst_mac, u_int32_t spa,
                                         u_int32_t tpa, u_int16_t vlan_id);
-  void pushLoginTrace(const char *user, bool authorized);
+  void pushLoginTrace(const char *user, const char *method, bool authorized);
   void pushNfqFlushedAlert(int queue_len, int queue_len_pct, int queue_dropped);
   void pushCloudDisconnectionAlert(const char *descr);
   void pushCloudReconnectionAlert(const char *descr);
diff --git a/include/HTTPserver.h b/include/HTTPserver.h
index 7ed117864af8..8b5530ce7589 100644
--- a/include/HTTPserver.h
+++ b/include/HTTPserver.h
@@ -57,7 +57,7 @@ class HTTPserver {
 
   bool valid_user_pwd(char *user, char *pass);
   static bool authorized_localhost_user_login(const struct mg_connection *conn);
-  static void traceLogin(const char *user, bool authorized);
+  static void traceLogin(const char *user, const char *method, bool authorized);
 
   bool authorize_noconn(char *username, char *session_id, u_int session_id_size,
                         u_int session_duration);
diff --git a/scripts/locales/en.lua b/scripts/locales/en.lua
index f9cdfb0c3c5c..7513144a9c00 100644
--- a/scripts/locales/en.lua
+++ b/scripts/locales/en.lua
@@ -8645,6 +8645,7 @@ local lang = {
     ["live_extraction_with_filter"] = "User '%{user}' downloaded traffic from interface %{ifname} from %{from} to %{to} matching filter '%{filter}'.",
     ["login_not_authorized"] = "Login denied for user '%{user}'.",
     ["login_successful"] = "User '%{user}' logged in.",
+    ["login_successful_method"] = "User '%{user}' logged in with '%{method}' authentication.",
     ["password_changed"] = "Password for user '%{pwd_user}' changed by '%{user}' with ip '%{ip}'.",
     ["recording_disabled"] = "User '%{user}' disabled Traffic Recording on interface %{ifname}.",
     ["recording_enabled"] = "User '%{user}' enabled Traffic Recording on interface %{ifname}.",
diff --git a/scripts/lua/modules/alert_definitions/other/alert_login_failed.lua b/scripts/lua/modules/alert_definitions/other/alert_login_failed.lua
index f23cf51aea66..8a347ea06180 100644
--- a/scripts/lua/modules/alert_definitions/other/alert_login_failed.lua
+++ b/scripts/lua/modules/alert_definitions/other/alert_login_failed.lua
@@ -31,11 +31,15 @@ alert_login_failed.meta = {
 
 -- @brief Prepare an alert table used to generate the alert
 -- @return A table with the alert built
-function alert_login_failed:init()
+function alert_login_failed:init(params)
    -- Call the parent constructor
    self.super:init()
 
-   self.alert_type_params = {}
+   self.alert_type_params = {
+      params = {
+         method = params.method
+      }
+   }
 end
 
 -- #######################################################
diff --git a/scripts/lua/modules/alert_definitions/other/alert_user_activity.lua b/scripts/lua/modules/alert_definitions/other/alert_user_activity.lua
index 4c2781851ba8..e3a3e4083b84 100644
--- a/scripts/lua/modules/alert_definitions/other/alert_user_activity.lua
+++ b/scripts/lua/modules/alert_definitions/other/alert_user_activity.lua
@@ -44,7 +44,9 @@ function alert_user_activity:init(scope, name, params, remote_addr, status)
    self.alert_type_params = {
 	scope = scope,
 	name = name,
-	params = params,
+	params = {
+           method = params.method
+        },
 	remote_addr = remote_addr,
 	status = status,
    }
@@ -55,12 +57,16 @@ end
 function alert_user_activity.format(ifid, alert, alert_type_params)
    local decoded = alert_type_params
    local user = alert.user or alert.entity_val
- 
+
    if decoded.scope ~= nil then
  
       if decoded.scope == 'login' and decoded.status ~= nil then
 	  if decoded.status == 'authorized' then
-		 return i18n('user_activity.login_successful', {user=user})
+		if decoded.params and decoded.params['method'] then
+			return i18n('user_activity.login_successful_method', {user=user, method=decoded.params['method']})
+		else
+			return i18n('user_activity.login_successful', {user=user})
+		end
 	  else
 		 return i18n('user_activity.login_not_authorized', {user=user})
 	  end
diff --git a/scripts/lua/modules/notifications/recipients.lua b/scripts/lua/modules/notifications/recipients.lua
index aa0b4f9080b7..66edd329d628 100644
--- a/scripts/lua/modules/notifications/recipients.lua
+++ b/scripts/lua/modules/notifications/recipients.lua
@@ -110,7 +110,7 @@ local function processStoreAlertFromQueue(alert)
         type_info:set_subtype(string.format("%s_%s_%s", alert.ip, alert.old_mac, alert.new_mac))
     elseif (alert.alert_id == "login_failed") then
         entity_info = alert_entity_builders.userEntity(alert.user)
-        type_info = alert_consts.alert_types.alert_login_failed.new()
+        type_info = alert_consts.alert_types.alert_login_failed.new(alert)
         type_info:set_score_warning()
     elseif (alert.alert_id == "broadcast_domain_too_large") then
         entity_info = alert_entity_builders.macEntity(alert.src_mac)
@@ -121,7 +121,7 @@ local function processStoreAlertFromQueue(alert)
             alert.tpa))
     elseif ((alert.alert_id == "user_activity") and (alert.scope == "login")) then
         entity_info = alert_entity_builders.userEntity(alert.user)
-        type_info = alert_consts.alert_types.alert_user_activity.new("login", nil, nil, nil, "authorized")
+        type_info = alert_consts.alert_types.alert_user_activity.new("login", nil, alert, nil, "authorized")
         type_info:set_score_notice()
         type_info:set_subtype("login//")
     elseif (alert.alert_id == "nfq_flushed") then
diff --git a/src/AlertsQueue.cpp b/src/AlertsQueue.cpp
index 9de5b128d861..795961404c43 100644
--- a/src/AlertsQueue.cpp
+++ b/src/AlertsQueue.cpp
@@ -170,7 +170,7 @@ void AlertsQueue::pushBroadcastDomainTooLargeAlert(const u_int8_t *src_mac,
 
 /* **************************************************** */
 
-void AlertsQueue::pushLoginTrace(const char *user, bool authorized) {
+void AlertsQueue::pushLoginTrace(const char *user, const char *method, bool authorized) {
   ndpi_serializer *tlv;
 
   if (ntop->getPrefs()->are_alerts_disabled()) return;
@@ -182,6 +182,8 @@ void AlertsQueue::pushLoginTrace(const char *user, bool authorized) {
 
     ndpi_serialize_string_string(tlv, "scope", "login");
     ndpi_serialize_string_string(tlv, "user", user);
+    if (method)
+      ndpi_serialize_string_string(tlv, "method", method);
 
     pushAlertJson(tlv, authorized ? "user_activity" : "login_failed", NULL, alert_category_system);
   }
diff --git a/src/HTTPserver.cpp b/src/HTTPserver.cpp
index 02927ae01de4..031de3c0c224 100644
--- a/src/HTTPserver.cpp
+++ b/src/HTTPserver.cpp
@@ -196,11 +196,11 @@ bool HTTPserver::authorized_localhost_user_login(
 
 /* ****************************************** */
 
-void HTTPserver::traceLogin(const char *user, bool authorized) {
+void HTTPserver::traceLogin(const char *user, const char *method, bool authorized) {
   if (ntop->getSystemInterface()
       /* Can be NULL during startup so check is necessary */
       && ntop->getSystemInterface()->getAlertsQueue())
-    ntop->getSystemInterface()->getAlertsQueue()->pushLoginTrace(user, authorized);
+    ntop->getSystemInterface()->getAlertsQueue()->pushLoginTrace(user, method, authorized);
 }
 
 /* ****************************************** */
@@ -242,7 +242,7 @@ static void create_session(const char *user, const char *group, bool localuser,
   ntop->getTrace()->traceEvent(TRACE_INFO, "[HTTP] Set session sessions.%s",
                                session_id);
 
-  HTTPserver::traceLogin(user, true);
+  HTTPserver::traceLogin(user, localuser ? "local" : "remote", true);
 }
 
 /* ****************************************** */
diff --git a/src/Ntop.cpp b/src/Ntop.cpp
index 3cf3e805bdb0..4a5d9927f1df 100644
--- a/src/Ntop.cpp
+++ b/src/Ntop.cpp
@@ -1988,7 +1988,8 @@ bool Ntop::checkGuiUserPassword(struct mg_connection *conn, const char *user,
   if (ntop->isCaptivePortalUser(user)) {
     ntop->getTrace()->traceEvent(
         TRACE_WARNING, "User %s is not a gui user. Login is denied.", user);
-    return false;
+    rv = false;
+    goto failure;
   }
 
   remote_ip = client_addr.print(ipbuf, sizeof(ipbuf));
@@ -2013,9 +2014,13 @@ bool Ntop::checkGuiUserPassword(struct mg_connection *conn, const char *user,
           TRACE_INFO, "IP %s is now blacklisted from login for %d seconds",
           remote_ip, FAILED_LOGIN_ATTEMPTS_INTERVAL);
 
-    HTTPserver::traceLogin(user, false);
-  } else
+  } else {
     ntop->getRedis()->del(key);
+  }
+
+ failure:
+  if (!rv)
+    HTTPserver::traceLogin(user, NULL, false);
 
   return (rv);
 }