SSO Client Refactoring, fixes