Fixed SSO compatibility