diff --git a/src/api/core/organizations.rs b/src/api/core/organizations.rs
index 864b7a89..6d8732d9 100644
--- a/src/api/core/organizations.rs
+++ b/src/api/core/organizations.rs
@@ -1880,15 +1880,20 @@ async fn list_policies_token(org_id: OrganizationId, token: &str, mut conn: DbCo
 }
 
 // Called during the SSO enrollment.
+// Cannot use the OrganizationId guard since the Org does not exists.
 #[get("/organizations/<org_id>/policies/master-password", rank = 1)]
-fn get_master_password_policy(org_id: OrganizationId, _headers: Headers) -> JsonResult {
+fn get_master_password_policy(org_id: &str, _headers: Headers) -> JsonResult {
     let data = match CONFIG.sso_master_password_policy() {
         Some(policy) => policy,
         None => "null".to_string(),
     };
 
-    let policy =
-        OrgPolicy::new(org_id, OrgPolicyType::MasterPassword, CONFIG.sso_master_password_policy().is_some(), data);
+    let policy = OrgPolicy::new(
+        OrganizationId(org_id.to_string()),
+        OrgPolicyType::MasterPassword,
+        CONFIG.sso_master_password_policy().is_some(),
+        data,
+    );
 
     Ok(Json(policy.to_json()))
 }
diff --git a/src/db/models/organization.rs b/src/db/models/organization.rs
index ba53432c..176e5c87 100644
--- a/src/db/models/organization.rs
+++ b/src/db/models/organization.rs
@@ -1156,7 +1156,7 @@ impl OrganizationApiKey {
 )]
 #[deref(forward)]
 #[from(forward)]
-pub struct OrganizationId(String);
+pub struct OrganizationId(pub String);
 
 #[derive(
     Clone,