pre email-as-username commit