Fix issue with duplicate emails being persisted.