SSO Client Refactoring