Allow SMTP credentials to be supplied
Merged patch