diff --git a/src/main/java/home/api/PersonEndpoint.java b/src/main/java/home/api/PersonEndpoint.java
index 990b7d4..d48aaaa 100644
--- a/src/main/java/home/api/PersonEndpoint.java
+++ b/src/main/java/home/api/PersonEndpoint.java
@@ -51,13 +51,16 @@ private ResponseEntity<Map<String, Object>> doPerson(BearerTokenAuthentication a
 
         Map<String, Object> tokenAttributes = authentication.getTokenAttributes();
         String eppn = (String) tokenAttributes.get("eduperson_principal_name");
+        String sub = (String) tokenAttributes.get("sub");
         String givenName = (String) tokenAttributes.get("given_name");
         String familyName = (String) tokenAttributes.get("family_name");
         String mail = (String) tokenAttributes.get("email");
 
-        LOG.debug(String.format("Persons request for person %s", eppn));
+        LOG.debug(String.format("Persons request for eppn: %s, sub: %s", eppn, sub));
 
-        map.put("personId", eppn);
+        if (StringUtils.hasText(eppn)) {
+            map.put("personId", eppn);
+        }
         if (StringUtils.hasText(mail)) {
             map.put("mail", mail);
         }