More GDS SSO compatibility