diff --git a/src/main/java/com/googlesource/gerrit/plugins/saml/SamlWebFilter.java b/src/main/java/com/googlesource/gerrit/plugins/saml/SamlWebFilter.java
index 8eaf717..06db693 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/saml/SamlWebFilter.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/saml/SamlWebFilter.java
@@ -282,7 +282,7 @@
           "Email address attribute not found, NameId {} does not look like an email.", nameId);
       return null;
     }
-    return emailAddress;
+    return nameId;
   }
 
   private String getUserName(SAML2Profile user) {