Substituted environment variables for email address
Expanded use of ENV vars