Fixing email update bug