diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc
index 9bfc29a0..b401f8dc 100644
--- a/wrenchboard/src/shared_tool/email.cc
+++ b/wrenchboard/src/shared_tool/email.cc
@@ -438,9 +438,9 @@ long job_email(long mailtype, CVars in, CVars &out) {
     char listing_items[1024];
     const PGresult *res;
 
-    char * server_name; // = getenv("SERVER_NAME");
+   // char * server_name; // = getenv("SERVER_NAME");
     out["server_name"] = CfgReadChar("system.server_name");
-	sprintf(server_name, "%s", out["server_name"].c_str());
+	//sprintf(server_name, "%s", out["server_name"].c_str());
     form.LetStr("server_name",  out["server_name"].c_str());
 	
     form.LetStr("site_name", "WrenchBoard");
@@ -482,7 +482,7 @@ long job_email(long mailtype, CVars in, CVars &out) {
                 vars2form(y, form);
                 // FOR CRON JOBS SET SERVER NAME
                 form.LetStr("preview_count", in["preview_count"].c_str());
-                form.LetStr("server_name", "dashboard.wrenchboard.com");
+                form.LetStr("server_name", out["server_name"].c_str());
                 vars2form(x, form);
                 form.LetStr("subject", "Completed Task Processing Past Due");
                 form.LetStr("email", y["email"].c_str());
@@ -496,7 +496,7 @@ long job_email(long mailtype, CVars in, CVars &out) {
 
             if (load_db_record(x, "SELECT m.firstname,m.email,mj.title,c.* FROM members_jobs_contract c LEFT JOIN members m ON m.id=c.client_id  LEFT JOIN members_jobs mj ON mj.id = c.job_id WHERE c.id=%lu AND c.due_remind IS NULL", in["contract_id"].Long())) {
                 // FOR CRON JOBS SET SERVER NAME
-                form.LetStr("server_name", "dashboard.wrenchboard.com");
+                form.LetStr("server_name", out["server_name"].c_str());
                 vars2form(x, form);
                 form.LetStr("subject", "Task Due Date Approaching");
                 form.LetStr("email", x["email"].c_str());
@@ -724,9 +724,9 @@ long sendmoney_email(long mailtype, CVars in, CVars &out) {
     CVars x, y, z;
     C_CGI_Form form("", "");
 
-    char * server_name; // = getenv("SERVER_NAME");
+    //char * server_name; // = getenv("SERVER_NAME");
     out["server_name"] = CfgReadChar("system.server_name");
-	sprintf(server_name, "%s", out["server_name"].c_str());
+	//sprintf(server_name, "%s", out["server_name"].c_str());
     form.LetStr("server_name",  out["server_name"].c_str());
 	
     form.LetStr("site_name", "WrenchBoard");
@@ -788,8 +788,9 @@ long project_email(long mailtype, CVars in, CVars &out) {
     CVars x, y, z;
     C_CGI_Form form("", "");
 
-    char * server_name = getenv("SERVER_NAME");
-    form.LetStr("server_name", server_name);
+   // char * server_name = getenv("SERVER_NAME");
+	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");
 
@@ -900,8 +901,8 @@ long test_email(CVars in, CVars &out) {
     CVars x;
     C_CGI_Form form("", "");
 
-    char * server_name = getenv("SERVER_NAME");
-    form.LetStr("server_name", server_name);
+    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");
 
@@ -921,8 +922,8 @@ long LocationAccountLoginMail(CVars in) {
     CVars out;
     C_CGI_Form form("", "");
 
-    char * server_name = getenv("SERVER_NAME");
-    form.LetStr("server_name", server_name);
+	out["server_name"] = CfgReadChar("system.server_name");
+    form.LetStr("server_name", out["server_name"].c_str());
     form.LetStr("site_name", "WrenchBoard");
 
     if (load_db_record(x, "SELECT * FROM members WHERE id = %lu ", in["member_id"].Long())) {
@@ -940,8 +941,8 @@ long ContactMessage(CVars in) {
     C_CGI_Form form("", "");
     out["alertemail"] = CfgReadChar("transnotif.contact");
 
-    char * server_name = getenv("SERVER_NAME");
-    form.LetStr("server_name", server_name);
+	out["server_name"] = CfgReadChar("system.server_name");
+    form.LetStr("server_name", out["server_name"].c_str());
     form.LetStr("site_name", "WrenchBoard");
     form.LetStr("subject", "WrenchBoard Contact Us Alert");
 
@@ -960,8 +961,8 @@ long SignupPendingAlertMailfile(CVars in) {
     C_CGI_Form form("", "");
     out["alertemail"] = CfgReadChar("transnotif.contact");
 
-    char * server_name = getenv("SERVER_NAME");
-    form.LetStr("server_name", server_name);
+	out["server_name"] = CfgReadChar("system.server_name");
+    form.LetStr("server_name", out["server_name"].c_str());
     form.LetStr("site_name", "WrenchBoard");
     form.LetStr("subject", "WrenchBoard Contact Us Alert");
 
@@ -980,8 +981,8 @@ long SignupCompletedAlertMailfile(CVars in) {
     C_CGI_Form form("", "");
     out["alertemail"] = CfgReadChar("transnotif.contact");
 
-    char * server_name = getenv("SERVER_NAME");
-    form.LetStr("server_name", server_name);
+	out["server_name"] = CfgReadChar("system.server_name");
+    form.LetStr("server_name", out["server_name"].c_str());
     form.LetStr("site_name", "WrenchBoard");
     form.LetStr("subject", "WrenchBoard Contact Us Alert");
 
@@ -1000,8 +1001,8 @@ long AlertActions(CVars in) {
     C_CGI_Form form("", "");
     out["alertemail"] = CfgReadChar("transnotif.contact");
 
-    char * server_name = getenv("SERVER_NAME");
-    form.LetStr("server_name", server_name);
+	out["server_name"] = CfgReadChar("system.server_name");
+    form.LetStr("server_name", out["server_name"].c_str());
     form.LetStr("site_name", "WrenchBoard");
 
     vars2form(in, form);
@@ -1017,8 +1018,8 @@ long ManagerAccountLoginMail(CVars in) {
     CVars out;
     C_CGI_Form form("", "");
 
-    char * server_name = getenv("SERVER_NAME");
-    form.LetStr("server_name", server_name);
+	out["server_name"] = CfgReadChar("system.server_name");
+    form.LetStr("server_name", out["server_name"].c_str());
     form.LetStr("site_name", "WrenchBoard");
 
     if (load_db_record(x, "SELECT * FROM members WHERE id = %lu ", in["member_id"].Long())) {
@@ -1036,8 +1037,8 @@ long AccountPendingMail(CVars in) //TESTED
     CVars out;
     C_CGI_Form form("", "");
 
-    char * server_name = getenv("SERVER_NAME");
-    form.LetStr("server_name", server_name);
+	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");
 
@@ -1066,8 +1067,8 @@ long WelcomeAccountMail(CVars in) // TESTED
     CVars out;
     C_CGI_Form form("", "");
 
-    char * server_name = getenv("SERVER_NAME");
-    form.LetStr("server_name", "https://dashboard.wrenchboard.com");
+	out["server_name"] = CfgReadChar("system.server_name");
+    form.LetStr("server_name", out["server_name"].c_str());
     form.LetStr("site_name", "WrenchBoard");
 
     if (load_db_record(x, "SELECT * FROM members WHERE id = %lu ", in["member_id"].Long())) {
@@ -1096,8 +1097,8 @@ long JobAddedMail(CVars in) //TESTED
     C_CGI_Form form("", "");
     const PGresult *res;
 
-    char * server_name = getenv("SERVER_NAME");
-    form.LetStr("server_name", "https://dashboard.wrenchboard.com");
+	out["server_name"] = CfgReadChar("system.server_name");
+    form.LetStr("server_name", out["server_name"].c_str());
     form.LetStr("site_name", "WrenchBoard");
 
     // testing exclusion first
@@ -1142,8 +1143,8 @@ long CreateWrenchBoardGroupMail(CVars in) {
     CVars out;
     C_CGI_Form form("", "");
 
-    char * server_name = getenv("SERVER_NAME");
-   form.LetStr("server_name", "https://dashboard.wrenchboard.com");
+	out["server_name"] = CfgReadChar("system.server_name");
+    form.LetStr("server_name", out["server_name"].c_str());
     form.LetStr("site_name", "WrenchBoard");
 
     if (load_db_record(x, "select g.*,m.email,m.firstname,m.lastname from members_groups g LEFT JOIN members m ON m.id = g.member_id WHERE g.id = %lu ", in["group_id"].Long())) {
@@ -1161,8 +1162,8 @@ long GroupCreateMemberMail(CVars in) {
     CVars out;
     C_CGI_Form form("", "");
 
-    char * server_name = getenv("SERVER_NAME");
-    form.LetStr("server_name", "https://dashboard.wrenchboard.com");
+	out["server_name"] = CfgReadChar("system.server_name");
+    form.LetStr("server_name", out["server_name"].c_str());
     form.LetStr("site_name", "WrenchBoard");
 
     if (load_db_record(x, "SELECT gm.*,m.*,e.email FROM group_members gm LEFT JOIN members_groups m ON m.id=gm.group_id LEFT JOIN members e ON e.id=gm.member_id WHERE gm.id = %lu", in["group_member_id"].Long())) {
@@ -1193,11 +1194,13 @@ long send_email(CVars in, CVars &out) {
 long EmailCustBalUpdt(CVars in) {
     REQ_LONG(in, "balance_update_id", 1, -1);
     C_CGI_Form form("", "");
-    char * server_name = getenv("SERVER_NAME");
+	CVars out;
+   	out["server_name"] = CfgReadChar("system.server_name");
+    form.LetStr("server_name", out["server_name"].c_str());
     CVars x;
 
     vars2form(x, form);
-    form.LetStr("server_name", "https://dashboard.wrenchboard.com");
+    //form.LetStr("server_name", "https://dashboard.wrenchboard.com");
     form.Email("test.mailfile");
     return 0;
 }
@@ -1289,7 +1292,9 @@ long StartPassResetEmail(CVars in) {
     vars2form(x, form);
 
 
-   form.LetStr("server_name", "https://dashboard.wrenchboard.com");
+   	out["server_name"] = CfgReadChar("system.server_name");
+    form.LetStr("server_name", out["server_name"].c_str());
+	
     /*
     CREATE TABLE lostpass (
      id serial NOT NULL,
@@ -1325,8 +1330,8 @@ long CompletePassResetEmail(CVars in) {
     vars2form(x, form);
 
 
-    form.LetStr("server_name", "https://dashboard.wrenchboard.com");
-
+    out["server_name"] = CfgReadChar("system.server_name");
+    form.LetStr("server_name", out["server_name"].c_str());
 
 
     form.LetStr("email", x["email"].c_str());