diff --git a/helpers/users_helper.py b/helpers/users_helper.py
index 5dd9994..5fe8b90 100644
--- a/helpers/users_helper.py
+++ b/helpers/users_helper.py
@@ -27,7 +27,7 @@ class Users_helper:
         logging.basicConfig(filename=logPath, filemode='a', level=logging.INFO)
         self.logger = logging.getLogger(__name__)
 
-    def add_user_login(self, timestamp, org):
+    def add_user_login(self, timestamp, org, email=''):
         timestampDate = datetime.datetime.fromtimestamp(float(timestamp))
         timestampDate_str = util.getDateStrFormat(timestampDate)
 
diff --git a/server.py b/server.py
index 23e9139..8a1943f 100755
--- a/server.py
+++ b/server.py
@@ -464,6 +464,10 @@ def getUserLogins():
     data = users_helper.getUserLoginsForPunchCard(date, org)
     return jsonify(data)
 
+@app.route("/_getAllLoggedOrg")
+def getAllLoggedOrg():
+    return jsonify(users_helper.getAllOrg())
+
 @app.route("/_getTopOrglogin")
 def getTopOrglogin():
     try:
diff --git a/templates/users.html b/templates/users.html
index a77096b..76b07f1 100644
--- a/templates/users.html
+++ b/templates/users.html
@@ -201,7 +201,7 @@ small {
         var url_getTopOrglogin = "{{ url_for('getTopOrglogin') }}";
         var url_getLoginVSCOntribution = "{{ url_for('getLoginVSCOntribution') }}";
         var url_getUserLoginsAndContribOvertime = "{{ url_for('getUserLoginsAndContribOvertime') }}";
-        var url_getTypeaheadData = "{{ url_for('getAllOrg') }}";
+        var url_getTypeaheadData = "{{ url_for('getAllLoggedOrg') }}";
 
         /* DATA FROM CONF */
 
diff --git a/zmq_dispatcher.py b/zmq_dispatcher.py
index cfb2dee..f7e73bb 100755
--- a/zmq_dispatcher.py
+++ b/zmq_dispatcher.py
@@ -74,10 +74,28 @@ def getFields(obj, fields):
 ## HANDLERS ##
 ##############
 
-def handler_log(zmq_name, jsonevent):
+def handler_skip(zmq_name, jsonevent):
     logger.info('Log not processed')
     return
 
+def handler_audit(zmq_name, jsondata):
+    action = jsondata.get('action', None)
+    jsonlog = jsondata.get('Log', None)
+
+    if action is None or jsonlog is None:
+        return
+
+    # consider login operations
+    if action == 'log': # audit is related to log
+        logAction = jsonlog.get('action', None)
+        if logAction == 'login': # only consider user login
+            timestamp = int(time.time())
+            email = jsonlog.get('email', '')
+            org = jsonlog.get('org', '')
+            users_helper.add_user_login(timestamp, org, email)
+    else:
+        pass
+
 def handler_dispatcher(zmq_name, jsonObj):
     if "Event" in jsonObj:
         handler_event(zmq_name, jsonObj)
@@ -87,15 +105,15 @@ def handler_keepalive(zmq_name, jsonevent):
     to_push = [ jsonevent['uptime'] ]
     live_helper.publish_log(zmq_name, 'Keepalive', to_push)
 
+# Login are no longer pushed by `misp_json_user`, but by `misp_json_audit`
 def handler_user(zmq_name, jsondata):
     logger.info('Handling user')
     action = jsondata['action']
     json_user = jsondata['User']
     json_org = jsondata['Organisation']
     org = json_org['name']
-    if action == 'login': #only consider user login
-        timestamp = int(time.time())
-        users_helper.add_user_login(timestamp, org)
+    if action == 'edit': #only consider user login
+        pass
     else:
         pass
 
@@ -264,10 +282,11 @@ dico_action = {
         "misp_json_attribute":      handler_attribute,
         "misp_json_object":         handler_object,
         "misp_json_sighting":       handler_sighting,
-        "misp_json_organisation":   handler_log,
+        "misp_json_organisation":   handler_skip,
         "misp_json_user":           handler_user,
         "misp_json_conversation":   handler_conversation,
-        "misp_json_object_reference": handler_log,
+        "misp_json_object_reference": handler_skip,
+        "misp_json_audit": handler_audit,
         }