Login via username or email address for 2-advanced

The goal will be to not have multiple user with the same email but also to allow user to login with email or username.