Using a username instead of email address has too much cognitive overhead and was a poor choice made long ago. Convert the auth machinery to use an email address as the username.