Sso improvements