diff --git a/wrenchboard/email/ALERT/alert_signup.mailfile b/wrenchboard/email/ALERT/alert_signup.mailfile
index 2691ec17..84120aa6 100644
--- a/wrenchboard/email/ALERT/alert_signup.mailfile
+++ b/wrenchboard/email/ALERT/alert_signup.mailfile
@@ -50,7 +50,7 @@ img {height: auto;}
 
 <tr>
 <td style="padding: 1px 0 1px 0; text-align:center;">
-<a href="https://www.wrenchboard.com/"><img src="https://dashboard.wrenchboard.com/assets/ext/images/wrenchboard.png" alt="WrenchBoard"></a>
+<a href="https://www.wrenchboard.com/"><img src="https://www.wrenchboard.com/assets/ext/images/wrenchboard.png" alt="WrenchBoard"></a>
 </td>
 </tr>
 <tr>
diff --git a/wrenchboard/email/JOB/job_due_reviewreminder.mailfile b/wrenchboard/email/JOB/job_due_reviewreminder.mailfile
index a35c1c78..6d00f5df 100644
--- a/wrenchboard/email/JOB/job_due_reviewreminder.mailfile
+++ b/wrenchboard/email/JOB/job_due_reviewreminder.mailfile
@@ -40,7 +40,7 @@ img {height: auto;}
 
 <tr>
 <td style="padding: 1px 0 1px 0; text-align:center;">
-<a href="https://www.wrenchboard.com/"><img src="https://dashboard.wrenchboard.com/assets/ext/images/wrenchboard.png" alt="WrenchBoard"></a> <!-- {{site_name}} -->
+<a href="https://www.wrenchboard.com/"><img src="https://www.wrenchboard.com/assets/ext/images/wrenchboard.png" alt="WrenchBoard"></a> <!-- {{site_name}} -->
 </td>
 </tr>
 <tr>
diff --git a/wrenchboard/email/JOB/job_interest_client.mailfile b/wrenchboard/email/JOB/job_interest_client.mailfile
index 9e31e7e4..67cb7dd6 100644
--- a/wrenchboard/email/JOB/job_interest_client.mailfile
+++ b/wrenchboard/email/JOB/job_interest_client.mailfile
@@ -41,7 +41,7 @@ img {height: auto;}
 
 <tr>
 <td style="padding: 1px 0 1px 0; text-align:center;">
-<a href="https://www.wrenchboard.com/"><img src="https://dashboard.wrenchboard.com/assets/ext/images/wrenchboard.png" alt="WrenchBoard"></a> <!-- {{site_name}} -->
+<a href="https://www.wrenchboard.com/"><img src="https://www.wrenchboard.com/assets/ext/images/wrenchboard.png" alt="WrenchBoard"></a> <!-- {{site_name}} -->
 </td>
 </tr>
 <tr>
diff --git a/wrenchboard/email/JOB/job_offer_invidual.mailfile b/wrenchboard/email/JOB/job_offer_invidual.mailfile
index 46ee48ab..98a48466 100644
--- a/wrenchboard/email/JOB/job_offer_invidual.mailfile
+++ b/wrenchboard/email/JOB/job_offer_invidual.mailfile
@@ -40,7 +40,7 @@ img {height: auto;}
 		        <table width="100%" border="0" cellspacing="0" cellpadding="0">
                   <tr>
                     <td class="h1" style="padding: 0px 0 0 0; text-align:center;">
-                     <a href="https://www.wrenchboard.com/"><img src="https://dashboard.wrenchboard.com/assets/ext/images/wrenchboard.png" alt="WrenchBoard"></a>
+                     <a href="https://www.wrenchboard.com/"><img src="https://www.wrenchboard.com/assets/ext/images/wrenchboard.png" alt="WrenchBoard"></a>
                     </td>
                   </tr>
                   <tr>
diff --git a/wrenchboard/email/JOB/job_offer_public.mailfile b/wrenchboard/email/JOB/job_offer_public.mailfile
index 71a16184..4acd57cd 100644
--- a/wrenchboard/email/JOB/job_offer_public.mailfile
+++ b/wrenchboard/email/JOB/job_offer_public.mailfile
@@ -50,7 +50,7 @@ img {height: auto;}
 
 	  <tr>
 		<td style="padding: 1px 0 1px 0; text-align:center;">
-		 <a href="https://www.wrenchboard.com/"><img src="https://dashboard.wrenchboard.com/assets/ext/images/wrenchboard.png" alt="WrenchBoard"></a>
+		 <a href="https://www.wrenchboard.com/"><img src="https://www.wrenchboard.com/assets/ext/images/wrenchboard.png" alt="WrenchBoard"></a>
 		</td>
 	  </tr>
 	  <tr>
diff --git a/wrenchboard/email/JOB/job_offer_sendtome.mailfile b/wrenchboard/email/JOB/job_offer_sendtome.mailfile
index bde5b09a..2ce90dbd 100644
--- a/wrenchboard/email/JOB/job_offer_sendtome.mailfile
+++ b/wrenchboard/email/JOB/job_offer_sendtome.mailfile
@@ -40,7 +40,7 @@ img {height: auto;}
 		        <table width="100%" border="0" cellspacing="0" cellpadding="0">
                   <tr>
                     <td class="h1" style="padding: 0px 0 0 0; text-align:center;">
-                     <a href="https://www.wrenchboard.com/"><img src="https://dashboard.wrenchboard.com/assets/ext/images/wrenchboard.png" alt="WrenchBoard"></a>
+                     <a href="https://www.wrenchboard.com/"><img src="https://www.wrenchboard.com/assets/ext/images/wrenchboard.png" alt="WrenchBoard"></a>
                     </td>
                   </tr>
                   <tr>
diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc
index 46ce5716..040534c2 100644
--- a/wrenchboard/src/shared_tool/email.cc
+++ b/wrenchboard/src/shared_tool/email.cc
@@ -1393,7 +1393,7 @@ long JobAddedMail(CVars in) //TESTED
         vars2form(x, form2);
         out["alertemail"] = CfgReadChar("transnotif.contact");
         char * server_name = getenv("SERVER_NAME");
-        form2.LetStr("server_name", "https://dashboard.wrenchboard.com");
+        form2.LetStr("server_name", "https://www.wrenchboard.com");
         form2.LetStr("site_name", "WrenchBoard");
         in["title"] = "Job Added Alert";
         in["message"] = "Job Added Alert";
@@ -1648,7 +1648,7 @@ long CustomerAirSalePayment(CVars in) {
         form.LetStr("paymode", "Payment with card");
     }
 
-    form.LetStr("server_name", "https://dashboard.wrenchboard.com");
+    form.LetStr("server_name", "https://www.wrenchboard.com");
     form.LetStr("site", server_name);
     form.LetStr("email", x["email2"].c_str());
     form.Email("topup_payment.mailfile"); //customer notification