Changes to support SSO.