Username -> E-mail for now
Merge pull request #4231 from dimagi/username-fix

Username -> E-mail for now