Unable to login with email without enabling email as username

[rksk]

This has occurred since we have obtained the tenant id from the username itself. But it is better to avoid it and use the service provider tenant domain since SaaS use-cases are rare and it is odd to enter usernames like below

• <mobile_number>@<tenant_domain>
• <email_address>@<tenant_domain>