refactored email settings
fixed observer delete bug