Update email functionality to add welcome message and abstract hostname

Additional improvements for #935