Bug Fix - Email gets persisted in the data store properly..