SSO generator improvements