Add serviceName in sso configuration
[SSO] Cosmetic updates