diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc
index 9a2fc250..c44a6f02 100644
--- a/wrenchboard/src/shared_tool/email.cc
+++ b/wrenchboard/src/shared_tool/email.cc
@@ -296,7 +296,7 @@ long account_email(long mailtype, CVars in, CVars &out) {
     bool exclude_email = true;
     char * server_name = getenv("SERVER_NAME");
 	
-	out["server_name"] = "http://localhost:9082/"; // CfgReadChar("system.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");
@@ -401,8 +401,8 @@ long account_email(long mailtype, CVars in, CVars &out) {
                         " FROM password_reset p "
                         " LEFT JOIN members m ON m.id =p.member_id  WHERE p.id = %lu ", in["password_reset_id"].Long())) {
                     vars2form(x, form);
-                   // form.LetStr("server_name",  out["server_name"].c_str());
-                      form.LetStr("server_name",  "http://localhost:9082");
+                      form.LetStr("server_name",  out["server_name"].c_str());
+                      //form.LetStr("server_name",  "http://localhost:9082");
                     form.Email("ACCOUNT/member_resetpass.mailfile");
                 }
                 break;
@@ -1079,7 +1079,7 @@ long AccountPendingMail(CVars in) //TESTED
     CVars out;
     C_CGI_Form form("", "");
 
-	out["server_name"] = "http://localhost:9082"; // CfgReadChar("system.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");
@@ -1334,8 +1334,8 @@ long StartPassResetEmail(CVars in) {
     vars2form(x, form);
 
 
-   	//out["server_name"] = CfgReadChar("system.server_name");
-   	out["server_name"] = "http://localhost:9082";
+   	out["server_name"] = CfgReadChar("system.server_name");
+   //	out["server_name"] = "http://localhost:9082";
     form.LetStr("server_name", out["server_name"].c_str());
 	
     /*