adding SSO stuff for 4.2.0