diff --git a/pillar/api/search/documents.py b/pillar/api/search/documents.py
index 979e7904..a697442d 100644
--- a/pillar/api/search/documents.py
+++ b/pillar/api/search/documents.py
@@ -53,6 +53,7 @@ class User(es.DocType):
         fielddata=True,
         analyzer=autocomplete,
     )
+    email_exact = es.Keyword()
 
     class Meta:
         index = 'users'
@@ -131,6 +132,8 @@ def create_doc_from_user_data(user_to_index: dict) -> User:
     doc.roles = list(map(str, user_to_index['roles']))
     doc.groups = list(map(str, user_to_index['groups']))
     doc.email = user_to_index['email']
+    doc.email_exact = user_to_index['email']
+
     return doc
 
 
diff --git a/pillar/api/search/queries.py b/pillar/api/search/queries.py
index eeb1901d..3494eb04 100644
--- a/pillar/api/search/queries.py
+++ b/pillar/api/search/queries.py
@@ -123,6 +123,9 @@ def _common_user_search(query: str) -> (typing.List[Query], typing.List[Query]):
         Q('match', email=query),
     ]
 
+    if '@' in query:
+        should.append(Q('term', email_exact=query))
+
     return [], should