Extend custom setting and fix mail settings