Update the handling of the username from the login service which now includes the domain
