Changed SSO behaviour default to the same as version 1