diff --git a/src/app/profile-page/profile-claim/profile-claim.service.ts b/src/app/profile-page/profile-claim/profile-claim.service.ts
index 62517c4b21..806f48a2f6 100644
--- a/src/app/profile-page/profile-claim/profile-claim.service.ts
+++ b/src/app/profile-page/profile-claim/profile-claim.service.ts
@@ -70,10 +70,8 @@ export class ProfileClaimService {
    * @param eperson The eperson to use for the lookup
    */
   private personQueryData(eperson: EPerson): string {
-    if (eperson) {
-      const firstname = eperson.firstMetadataValue('eperson.firstname');
-      const lastname = eperson.firstMetadataValue('eperson.lastname');
-      return '(dc.title:' + eperson.name + ') OR (person.familyName:' + lastname + ' AND person.givenName:' + firstname + ')';
+    if (eperson && eperson.email) {
+      return 'person.email:' + eperson.email;
     } else {
       return null;
     }