Expanding some config options.  Should fix email issue with warranty.