Further SSO enhancements