Changed username field to be email