diff --git a/docs/sources/setup-grafana/configure-grafana/enterprise-configuration/index.md b/docs/sources/setup-grafana/configure-grafana/enterprise-configuration/index.md
index e5be11382e0..33b10567cd6 100644
--- a/docs/sources/setup-grafana/configure-grafana/enterprise-configuration/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/enterprise-configuration/index.md
@@ -290,11 +290,11 @@ Friendly name or name of the attribute within the SAML assertion to use as the u
 
 ### assertion_attribute_login
 
-Friendly name or name of the attribute within the SAML assertion to use as the user login handle.
+Friendly name or name of the attribute within the SAML assertion to use as the user login handle. Defaults to `login`.
 
 ### assertion_attribute_email
 
-Friendly name or name of the attribute within the SAML assertion to use as the user email.
+Friendly name or name of the attribute within the SAML assertion to use as the user email. Defaults to `email`.
 
 ### assertion_attribute_groups
 
@@ -310,7 +310,7 @@ Friendly name or name of the attribute within the SAML assertion to use as the u
 
 ### assertion_attribute_external_uid
 
-Friendly name or name of the attribute within the SAML assertion to use as the user external UID.
+Friendly name or name of the attribute within the SAML assertion to use as the user external UID. Defaults to `userUID`.
 
 ### allowed_organizations
 
diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/saml/saml-configuration-options/_index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/saml/saml-configuration-options/_index.md
index ec60b9ce2f2..b87493a61fa 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/saml/saml-configuration-options/_index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/saml/saml-configuration-options/_index.md
@@ -31,8 +31,8 @@ The table below describes all SAML configuration options. Continue reading below
 | `metadata_valid_duration`                                  | No       | Duration for which the SP metadata remains valid.                                                                                                                                                            | `48h`                                                 |
 | `relay_state`                                              | No       | Relay state for IdP-initiated login. This should match the relay state configured in the IdP.                                                                                                                |                                                       |
 | `assertion_attribute_name`                                 | No       | Friendly name or name of the attribute within the SAML assertion to use as the user name. Alternatively, this can be a template with variables that match the names of attributes within the SAML assertion. | `displayName`                                         |
-| `assertion_attribute_login`                                | No       | Friendly name or name of the attribute within the SAML assertion to use as the user login handle.                                                                                                            | `mail`                                                |
-| `assertion_attribute_email`                                | No       | Friendly name or name of the attribute within the SAML assertion to use as the user email.                                                                                                                   | `mail`                                                |
+| `assertion_attribute_login`                                | No       | Friendly name or name of the attribute within the SAML assertion to use as the user login handle.                                                                                                            | `login`                                               |
+| `assertion_attribute_email`                                | No       | Friendly name or name of the attribute within the SAML assertion to use as the user email.                                                                                                                   | `email`                                               |
 | `assertion_attribute_groups`                               | No       | Friendly name or name of the attribute within the SAML assertion to use as the user groups.                                                                                                                  |                                                       |
 | `assertion_attribute_role`                                 | No       | Friendly name or name of the attribute within the SAML assertion to use as the user roles.                                                                                                                   |                                                       |
 | `assertion_attribute_org`                                  | No       | Friendly name or name of the attribute within the SAML assertion to use as the user organization                                                                                                             |                                                       |