diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc
index c170401b..b2b4f1a8 100644
--- a/wrenchboard/src/shared_tool/email.cc
+++ b/wrenchboard/src/shared_tool/email.cc
@@ -75,10 +75,16 @@ long promo_email(long mailtype, CVars in, CVars &out){
     load_db_record(yr, "SELECT to_char(now(), 'yyyy') AS YYYY, TO_CHAR(NOW(), 'Day Mon dd, yyyy hh:mm AM') AS report_date");
     vars2form(yr, form);
 
-    char * server_name = getenv("SERVER_NAME");
-    form.LetStr("server_name", server_name);
-    form.LetStr("site_name", "WrenchBoard");
+    //char * server_name = getenv("SERVER_NAME");
+    //form.LetStr("server_name", server_name);
+    //form.LetStr("site_name", "WrenchBoard");
     form.LetStr("site_trade_name", "Connecting Opportunities");
+
+    out["server_name"] =  CfgReadChar("system.server_name");
+    form.LetStr("server_name",  out["server_name"].c_str());
+    //form.LetStr("site_name", "WrenchBoard");
+    //form.LetStr("site_trade_name", "Connecting Opportunities");
+
     switch (mailtype) {
 
         case WRB_CRONJOB_PROCESS_PROMO: