change everything around to use email rather than username