Everything is now keyed off email rather than username