Remove the username, using email instead