diff --git a/grimoire/elk/bugzilla.py b/grimoire/elk/bugzilla.py
index <HASH>..<HASH> 100644
--- a/grimoire/elk/bugzilla.py
+++ b/grimoire/elk/bugzilla.py
@@ -61,7 +61,11 @@ class BugzillaEnrich(Enrich):
 
         def fill_list_identity(identity, user_list_data):
             """ Fill identity with user data in first item in list """
-            identity['username'] = user_list_data[0]['__text__']
+            if '@' in user_list_data[0]['__text__']:
+                # Auth bugzilla data includes emails
+                identity['email'] = user_list_data[0]['__text__']
+            else:
+                identity['username'] = user_list_data[0]['__text__']
             if 'name' in user_list_data[0]:
                 identity['name'] = user_list_data[0]['name']
[Bugzilla SH Identities] Add email if we have this data.