diff --git a/ayanova/src/views/customer-notify-subscription.vue b/ayanova/src/views/customer-notify-subscription.vue
index 84a5d383..66ce22ef 100644
--- a/ayanova/src/views/customer-notify-subscription.vue
+++ b/ayanova/src/views/customer-notify-subscription.vue
@@ -263,9 +263,14 @@
                       @input="fieldValueChanged('template')"
                     ></v-textarea>
                   </v-col>
-                  <v-col cols="12" sm="6" lg="4" xl="3">
+                  <v-col
+                    v-if="showWorkOrderTokenSelector"
+                    cols="12"
+                    sm="6"
+                    lg="4"
+                    xl="3"
+                  >
                     <v-select
-                      v-if="showWorkOrderTokenSelector"
                       v-model="woToken"
                       prepend-icon="$ayiPlus"
                       :items="selectLists.workOrderTemplateTokens"
@@ -275,6 +280,42 @@
                       @click:prepend="insertToken(woToken)"
                     ></v-select>
                   </v-col>
+
+                  <v-col
+                    v-if="showQuoteTokenSelector"
+                    cols="12"
+                    sm="6"
+                    lg="4"
+                    xl="3"
+                  >
+                    <v-select
+                      v-model="quoteToken"
+                      prepend-icon="$ayiPlus"
+                      :items="selectLists.quoteTemplateTokens"
+                      item-text="name"
+                      item-value="id"
+                      :label="$ay.t('TemplateTokens')"
+                      @click:prepend="insertToken(quoteToken)"
+                    ></v-select>
+                  </v-col>
+
+                  <v-col
+                    v-if="showCSRTokenSelector"
+                    cols="12"
+                    sm="6"
+                    lg="4"
+                    xl="3"
+                  >
+                    <v-select
+                      v-model="csrToken"
+                      prepend-icon="$ayiPlus"
+                      :items="selectLists.csrTemplateTokens"
+                      item-text="name"
+                      item-value="id"
+                      :label="$ay.t('TemplateTokens')"
+                      @click:prepend="insertToken(csrToken)"
+                    ></v-select>
+                  </v-col>
                 </v-row>
               </v-tab-item>
               <v-tab-item class="mt-4 ml-2">
@@ -476,7 +517,9 @@ export default {
       tab: 0,
       whoDialog: false,
       whoList: [],
-      woToken: null
+      woToken: null,
+      quoteToken: null,
+      csrToken: null
     };
   },
   computed: {
@@ -718,8 +761,6 @@ export default {
         0,
         t
       );
-
-      // console.log("INSERT TOKEN: ", t);
     },
     objectTagsTitle() {
       let objectName = null;
@@ -1083,7 +1124,11 @@ async function fetchTranslatedText() {
     "WorkOrderSummary",
     "WorkOrderSerialNumber",
     "Name",
-    "TemplateTokens"
+    "TemplateTokens",
+    "QuoteSerialNumber",
+    "QuoteIntroduction",
+    "QuoteQuoteRequestDate",
+    "QuoteValidUntilDate"
   ]);
 }
 
@@ -1165,7 +1210,10 @@ CSR:
 
 */
   const wo = vm.$ay.t("WorkOrder") + " ";
+  const quote = vm.$ay.t("Quote") + " ";
+  const csr = vm.$ay.t("CustomerServiceRequest") + " ";
   const cust = vm.$ay.t("Customer") + " ";
+
   vm.selectLists.workOrderTemplateTokens.push(
     ...[
       { name: cust + vm.$ay.t("Name"), id: "{{Customer}}" },
@@ -1189,7 +1237,62 @@ CSR:
         name: wo + vm.$ay.t("WorkOrderSerialNumber"),
         id: "{{WorkOrderSerialNumber}}"
       }
-    ]
+    ].sort(window.$gz.util.sortByKey("name"))
+  );
+
+  vm.selectLists.quoteTemplateTokens.push(
+    ...[
+      { name: cust + vm.$ay.t("Name"), id: "{{Customer}}" },
+      {
+        name: quote + vm.$ay.t("QuoteQuoteRequestDate"),
+        id: "{{QuoteQuoteRequestDate}}"
+      },
+      {
+        name: quote + vm.$ay.t("QuoteValidUntilDate"),
+        id: "{{QuoteValidUntilDate}}"
+      },
+
+      {
+        name: vm.$ay.t("QuoteIntroduction"),
+        id: "{{QuoteIntroduction}}"
+      },
+      {
+        name: wo + vm.$ay.t("WorkOrderCustomerContactName"),
+        id: "{{WorkOrderCustomerContactName}}"
+      },
+      {
+        name: vm.$ay.t("WorkOrderCustomerReferenceNumber"),
+        id: "{{WorkOrderCustomerReferenceNumber}}"
+      },
+      {
+        name: wo + vm.$ay.t("WorkOrderSummary"),
+        id: "{{WorkOrderSummary}}"
+      },
+      {
+        name: quote + vm.$ay.t("QuoteSerialNumber"),
+        id: "{{QuoteSerialNumber}}"
+      }
+    ].sort(window.$gz.util.sortByKey("name"))
+  );
+
+  vm.selectLists.csrTemplateTokens.push(
+    ...[
+      { name: cust + vm.$ay.t("Name"), id: "{{Customer}}" },
+
+      {
+        name: vm.$ay.t("CustomerServiceRequestRequestedBy"),
+        id: "{{CustomerServiceRequestRequestedBy}}"
+      },
+      {
+        name: csr + vm.$ay.t("CustomerServiceRequestCustomerReferenceNumber"),
+        id: "{{CustomerServiceRequestCustomerReferenceNumber}}"
+      },
+
+      {
+        name: csr + vm.$ay.t("CustomerServiceRequestTitle"),
+        id: "{{CustomerServiceRequestTitle}}"
+      }
+    ].sort(window.$gz.util.sortByKey("name"))
   );
 }
 </script>