[Update] Fix email User setting inconsistency