You can probably work around this now by opting into the new SP-initiated SSO feature and using the custom entity ID that you set, but personally I'd have one SSO configuration and use roles to determine who has access to which organisations.
... View more