added SSO support