diff --git a/backend/src/ee/routes/v1/saml-router.ts b/backend/src/ee/routes/v1/saml-router.ts
index 2e93abbb3..1ca24cae7 100644
--- a/backend/src/ee/routes/v1/saml-router.ts
+++ b/backend/src/ee/routes/v1/saml-router.ts
@@ -63,7 +63,8 @@ export const registerSamlRouter = async (server: FastifyZodProvider) => {
}
const ssoConfig = await server.services.saml.getSaml(ssoLookupDetails);
- if (!ssoConfig) throw new BadRequestError({ message: "SSO config not found" });
+ if (!ssoConfig || !ssoConfig.isActive)
+ throw new BadRequestError({ message: "Failed to authenticate with SAML SSO" });
const samlConfig: TSAMLConfig = {
callbackUrl: `${appCfg.SITE_URL}/api/v1/sso/saml2/${samlConfigId}`,
diff --git a/docs/documentation/platform/sso/okta.mdx b/docs/documentation/platform/sso/okta.mdx
index c07aca9ac..a892ebfb3 100644
--- a/docs/documentation/platform/sso/okta.mdx
+++ b/docs/documentation/platform/sso/okta.mdx
@@ -74,9 +74,16 @@ description: "Configure Okta SAML 2.0 for Infisical SSO"
At this point, you have configured everything you need within the context of the Okta Admin Portal.
- Enabling SAML SSO enforces all members in your organization to only be able to log into Infisical via Okta.
+ Enabling SAML SSO allows members in your organization to log into Infisical via Okta.
- 
+ 
+
+
+ Enforcing SAML SSO requires members in your organization can only access Infisical
+ by logging into the organization via Okta.
+
+ To enforce SAML SSO, you're required to test out the SAML connection by successfully authenticating at least one Okta user with Infisical;
+ Once you've completed this requirement, you can toggle the **Enforce SAML SSO** button to enforce SAML SSO.