Enabled login from both user name and email address while allowing users to choose their own username too