Change username validation to not use @ and +
Make login with the username or email