diff --git a/apps/web/docs/saml-setup.md b/apps/web/docs/saml-setup.md
index aaf55207fd..26e7df3bcb 100644
--- a/apps/web/docs/saml-setup.md
+++ b/apps/web/docs/saml-setup.md
@@ -18,10 +18,10 @@ This guide explains the settings you need to use to configure SAML with your Ide
 
 **Mapping Attributes / Attribute Statements:**
 
-id -> user.id
+http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier -> id
 
-email -> user.email
+http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress -> email
 
-firstName -> user.firstName
+http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname -> firstName
 
-lastName -> user.lastName
+http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname -> lastName
diff --git a/apps/web/pages/api/auth/[...nextauth].tsx b/apps/web/pages/api/auth/[...nextauth].tsx
index 28e81dfb15..64d618d9bd 100644
--- a/apps/web/pages/api/auth/[...nextauth].tsx
+++ b/apps/web/pages/api/auth/[...nextauth].tsx
@@ -328,7 +328,7 @@ export default NextAuth({
         if (account.provider === "saml") {
           idP = IdentityProvider.SAML;
         }
-        user.email_verified = user.email_verified || profile.email_verified;
+        user.email_verified = user.email_verified || user.emailVerified || profile.email_verified;
 
         if (!user.email_verified) {
           return "/auth/error?error=unverified-email";