Initial support for distinct services
Support for distinct services in login flow