diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/adapters/keycloak.py b/SAS/TMSS/backend/src/tmss/tmssapp/adapters/keycloak.py
index d0514dbb01a794e95484783b8116729c6f257198..00641dc862f4504a0d85b0dbdd33ff1003b02343 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/adapters/keycloak.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/adapters/keycloak.py
@@ -127,7 +127,7 @@ def get_user_mapping():
                     user_map[ldap_dn] = user['email']
                 for ldap_dn in user['attributes'].get('KEYCLOAK_DN', []):
                     user_map[ldap_dn] = user['email']
-            if 'firstName' in user and 'lastName' in user:
+            if 'firstName' in user and 'lastName' in user and 'email' in user:
                 user_map['%s, %s' % (user['lastName'], user['firstName'])] = user['email']
 
     return user_map