Storing emails now, plus truly treating usernames like emails