minor changes in setup_mail_production