diff --git a/server/AyaNova/generator/CoreJobCustomerNotify.cs b/server/AyaNova/generator/CoreJobCustomerNotify.cs
index 621963dd..e83c25ec 100644
--- a/server/AyaNova/generator/CoreJobCustomerNotify.cs
+++ b/server/AyaNova/generator/CoreJobCustomerNotify.cs
@@ -193,8 +193,9 @@ namespace AyaNova.Biz
                                         }
 
                                         var CustomerName = await ct.Customer.AsNoTracking().Where(x => x.Id == csr.CustomerId).Select(x => x.Name).FirstOrDefaultAsync();
-                                        Subject = SetCSRTokens(Subject, csr, CustomerName);
-                                        Body = SetCSRTokens(Body, csr, CustomerName);
+                                        var UserName = await ct.User.AsNoTracking().Where(x => x.Id == csr.RequestedByUserId).Select(x => x.Name).FirstOrDefaultAsync();
+                                        Subject = SetCSRTokens(Subject, csr, CustomerName, UserName);
+                                        Body = SetCSRTokens(Body, csr, CustomerName, UserName);
                                     }
                                     break;
                             }
@@ -360,7 +361,7 @@ namespace AyaNova.Biz
         }
 
 
-        private static string SetCSRTokens(string TheField, CustomerServiceRequest csr, string CustomerName)
+        private static string SetCSRTokens(string TheField, CustomerServiceRequest csr, string CustomerName, string requestedBy)
         {
             MatchCollection matches = Regex.Matches(TheField, @"\{{(.|\n)*?\}}", RegexOptions.IgnorePatternWhitespace | RegexOptions.Compiled);
             //{{.*?}}
@@ -371,22 +372,15 @@ namespace AyaNova.Biz
                     case "{{Customer}}":
                         TheField = TheField.Replace(KeyMatch.Value, CustomerName);
                         break;
-                    case "{{QuoteIntroduction}}":
-                        TheField = TheField.Replace(KeyMatch.Value, csr.Introduction);
+                    case "{{CustomerServiceRequestRequestedBy}}":
+                        TheField = TheField.Replace(KeyMatch.Value, requestedBy);
                         break;
-                    case "{{WorkOrderCustomerContactName}}":
-                        TheField = TheField.Replace(KeyMatch.Value, csr.CustomerContactName);
-                        break;
-                    case "{{WorkOrderCustomerReferenceNumber}}":
+                    case "{{CustomerServiceRequestCustomerReferenceNumber}}":
                         TheField = TheField.Replace(KeyMatch.Value, csr.CustomerReferenceNumber);
                         break;
-                    case "{{WorkOrderSummary}}":
-                        TheField = TheField.Replace(KeyMatch.Value, csr.Notes);
+                    case "{{CustomerServiceRequestTitle}}":
+                        TheField = TheField.Replace(KeyMatch.Value, csr.Name);
                         break;
-                    case "{{QuoteSerialNumber}}":
-                        TheField = TheField.Replace(KeyMatch.Value, csr.Serial.ToString());
-                        break;
-
                 }
             }