diff --git a/app/__init__.py b/app/__init__.py
index 3dc5f8e3057b317ec2c7851e812367792b57e4f8..dec01b4597164949d1519be9cee89ecd046f11ec 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -23,16 +23,12 @@ def create_app(config_name):
     Bootstrap(app) # allowing app to use bootstrap
 
     def get_authorized_user():
-        username_key = list(filter(lambda key: (request.headers.get(key)  is not None), vars.username_key))
-        fullname_key = list(filter(lambda key: (request.headers.get(key) is not None), vars.fullname_key))
-        email_key = list(filter(lambda key: (request.headers.get(key) is not None), vars.email_key))
-        eppa_key = list(filter(lambda key: (request.headers.get(key) is not None), vars.eppa_key))
 
         user = {
-            "username": (request.headers.get(username_key[0]) if len(username_key) > 0 else None),
-            "fullname": (request.headers.get(fullname_key[0]) if len(fullname_key) > 0 else None),
-            "email": (request.headers.get(email_key[0]) if len(email_key) > 0 else None),
-            "eppa": (request.headers.get(eppa_key[0]) if len(eppa_key) > 0 else None),
+            "username": re.search("([^!]+?)(@uab\.edu)?$", request.headers.get("Persistent-Id")).group(1),
+            "fullname": f'{request.headers.get("Givenname")} {request.headers.get("Sn")}',
+            "email": request.headers.get("Mail"),
+            "eppa": request.headers.get("Unscoped-Affiliation"),
         }
 
         return user