diff --git a/src/api/core/organizations.rs b/src/api/core/organizations.rs
index f2475314..ab956188 100644
--- a/src/api/core/organizations.rs
+++ b/src/api/core/organizations.rs
@@ -354,9 +354,11 @@ async fn get_auto_enroll_status(identifier: &str, headers: Headers, mut conn: Db
 
     let (id, identifier, rp_auto_enroll) = match org {
         None => (get_uuid(), identifier.to_string(), false),
-        Some(org) => {
-            (org.uuid.to_string(), org.name, OrgPolicy::org_is_reset_password_auto_enroll(&org.uuid, &mut conn).await)
-        }
+        Some(org) => (
+            org.uuid.to_string(),
+            org.uuid.to_string(),
+            OrgPolicy::org_is_reset_password_auto_enroll(&org.uuid, &mut conn).await,
+        ),
     };
 
     Ok(Json(json!({
diff --git a/src/mail.rs b/src/mail.rs
index ca5b7eb5..376efd7e 100644
--- a/src/mail.rs
+++ b/src/mail.rs
@@ -304,7 +304,7 @@ pub async fn send_invite(
 
         if CONFIG.sso_enabled() && CONFIG.sso_only() {
             query_params.append_pair("orgUserHasExistingUser", "false");
-            query_params.append_pair("orgSsoIdentifier", org_name);
+            query_params.append_pair("orgSsoIdentifier", &org_id);
         } else if user.private_key.is_some() {
             query_params.append_pair("orgUserHasExistingUser", "true");
         }