Changed username to be email