diff --git a/ayanova/src/views/adm-global-settings.vue b/ayanova/src/views/adm-global-settings.vue
index 63d3f75f..2011a8ef 100644
--- a/ayanova/src/views/adm-global-settings.vue
+++ b/ayanova/src/views/adm-global-settings.vue
@@ -147,7 +147,7 @@
               {{ $ay.t("CustomerAccessSettings") }}
             </div>
           </v-col>
-
+          <!-- ######################################################## -->
           <v-col cols="12">
             <div class="text-subtitle-1">
               {{ $ay.t("CustomerServiceRequestList") }}
@@ -190,7 +190,7 @@
               @input="fieldValueChanged('customerAllowCSROutTags')"
             ></gz-tag-picker>
           </v-col>
-
+          <!-- ######################################################## -->
           <v-col cols="12">
             <div class="text-subtitle-1">
               {{ $ay.t("WorkOrderList") }}
@@ -233,6 +233,311 @@
               @input="fieldValueChanged('customerAllowViewWOOutTags')"
             ></gz-tag-picker>
           </v-col>
+
+          <!-- ######################################################## -->
+          <v-col cols="12">
+            <div class="text-subtitle-1">
+              {{ $ay.t("CustomerAccessWorkOrderWiki") }}
+            </div>
+          </v-col>
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-checkbox
+              v-model="obj.customerAllowWOWiki"
+              :readonly="formState.readOnly"
+              :label="$ay.t('Active')"
+              ref="customerAllowWOWiki"
+              data-cy="customerAllowWOWiki"
+              :error-messages="form().serverErrors(this, 'customerAllowWOWiki')"
+              @change="fieldValueChanged('customerAllowWOWiki')"
+            ></v-checkbox>
+          </v-col>
+          <v-col cols="12" sm="6" lg="4">
+            <gz-tag-picker
+              v-model="obj.customerAllowWOWikiInTags"
+              :readonly="formState.readOnly"
+              :label="$ay.t('TaggedWith')"
+              ref="customerAllowWOWikiInTags"
+              data-cy="customerAllowWOWikiInTags"
+              :error-messages="
+                form().serverErrors(this, 'customerAllowWOWikiInTags')
+              "
+              @input="fieldValueChanged('customerAllowWOWikiInTags')"
+            ></gz-tag-picker>
+          </v-col>
+          <v-col cols="12" sm="6" lg="4">
+            <gz-tag-picker
+              v-model="obj.customerAllowWOWikiOutTags"
+              :readonly="formState.readOnly"
+              :label="$ay.t('NotTaggedWith')"
+              ref="customerAllowWOWikiOutTags"
+              data-cy="customerAllowWOWikiOutTags"
+              :error-messages="
+                form().serverErrors(this, 'customerAllowWOWikiOutTags')
+              "
+              @input="fieldValueChanged('customerAllowWOWikiOutTags')"
+            ></gz-tag-picker>
+          </v-col>
+
+          <!-- ######################################################## -->
+          <v-col cols="12">
+            <div class="text-subtitle-1">
+              {{ $ay.t("UserSettings") }}
+            </div>
+          </v-col>
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-checkbox
+              v-model="obj.customerAllowUserSettings"
+              :readonly="formState.readOnly"
+              :label="$ay.t('Active')"
+              ref="customerAllowUserSettings"
+              data-cy="customerAllowUserSettings"
+              :error-messages="
+                form().serverErrors(this, 'customerAllowUserSettings')
+              "
+              @change="fieldValueChanged('customerAllowUserSettings')"
+            ></v-checkbox>
+          </v-col>
+          <v-col cols="12" sm="6" lg="4">
+            <gz-tag-picker
+              v-model="obj.customerAllowUserSettingsInTags"
+              :readonly="formState.readOnly"
+              :label="$ay.t('TaggedWith')"
+              ref="customerAllowUserSettingsInTags"
+              data-cy="customerAllowUserSettingsInTags"
+              :error-messages="
+                form().serverErrors(this, 'customerAllowUserSettingsInTags')
+              "
+              @input="fieldValueChanged('customerAllowUserSettingsInTags')"
+            ></gz-tag-picker>
+          </v-col>
+          <v-col cols="12" sm="6" lg="4">
+            <gz-tag-picker
+              v-model="obj.customerAllowUserSettingsOutTags"
+              :readonly="formState.readOnly"
+              :label="$ay.t('NotTaggedWith')"
+              ref="customerAllowUserSettingsOutTags"
+              data-cy="customerAllowUserSettingsOutTags"
+              :error-messages="
+                form().serverErrors(this, 'customerAllowUserSettingsOutTags')
+              "
+              @input="fieldValueChanged('customerAllowUserSettingsOutTags')"
+            ></gz-tag-picker>
+          </v-col>
+
+          <!-- ######################################################## -->
+          <v-col cols="12">
+            <div class="text-h6">
+              {{ $ay.t("NotifySubscriptionList") }}
+            </div>
+            <div class="text-subtitle-1">
+              {{ $ay.t("NotifyEventCustomerServiceImminent") }}
+            </div>
+          </v-col>
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-checkbox
+              v-model="obj.customerAllowNotifyServiceImminent"
+              :readonly="formState.readOnly"
+              :label="$ay.t('Active')"
+              ref="customerAllowNotifyServiceImminent"
+              data-cy="customerAllowNotifyServiceImminent"
+              :error-messages="
+                form().serverErrors(this, 'customerAllowNotifyServiceImminent')
+              "
+              @change="fieldValueChanged('customerAllowNotifyServiceImminent')"
+            ></v-checkbox>
+          </v-col>
+          <v-col cols="12" sm="6" lg="4">
+            <gz-tag-picker
+              v-model="obj.customerAllowNotifyServiceImminentInTags"
+              :readonly="formState.readOnly"
+              :label="$ay.t('TaggedWith')"
+              ref="customerAllowNotifyServiceImminentInTags"
+              data-cy="customerAllowNotifyServiceImminentInTags"
+              :error-messages="
+                form().serverErrors(
+                  this,
+                  'customerAllowNotifyServiceImminentInTags'
+                )
+              "
+              @input="
+                fieldValueChanged('customerAllowNotifyServiceImminentInTags')
+              "
+            ></gz-tag-picker>
+          </v-col>
+          <v-col cols="12" sm="6" lg="4">
+            <gz-tag-picker
+              v-model="obj.customerAllowNotifyServiceImminentOutTags"
+              :readonly="formState.readOnly"
+              :label="$ay.t('NotTaggedWith')"
+              ref="customerAllowNotifyServiceImminentOutTags"
+              data-cy="customerAllowNotifyServiceImminentOutTags"
+              :error-messages="
+                form().serverErrors(
+                  this,
+                  'customerAllowNotifyServiceImminentOutTags'
+                )
+              "
+              @input="
+                fieldValueChanged('customerAllowNotifyServiceImminentOutTags')
+              "
+            ></gz-tag-picker>
+          </v-col>
+
+          <!-- ######################################################## -->
+          <v-col cols="12">
+            <div class="text-subtitle-1">
+              {{ $ay.t("NotifyEventCSRAccepted") }}
+            </div>
+          </v-col>
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-checkbox
+              v-model="obj.customerAllowNotifyCSRAccepted"
+              :readonly="formState.readOnly"
+              :label="$ay.t('Active')"
+              ref="customerAllowNotifyCSRAccepted"
+              data-cy="customerAllowNotifyCSRAccepted"
+              :error-messages="
+                form().serverErrors(this, 'customerAllowNotifyCSRAccepted')
+              "
+              @change="fieldValueChanged('customerAllowNotifyCSRAccepted')"
+            ></v-checkbox>
+          </v-col>
+          <v-col cols="12" sm="6" lg="4">
+            <gz-tag-picker
+              v-model="obj.customerAllowNotifyCSRAcceptedInTags"
+              :readonly="formState.readOnly"
+              :label="$ay.t('TaggedWith')"
+              ref="customerAllowNotifyCSRAcceptedInTags"
+              data-cy="customerAllowNotifyCSRAcceptedInTags"
+              :error-messages="
+                form().serverErrors(
+                  this,
+                  'customerAllowNotifyCSRAcceptedInTags'
+                )
+              "
+              @input="fieldValueChanged('customerAllowNotifyCSRAcceptedInTags')"
+            ></gz-tag-picker>
+          </v-col>
+          <v-col cols="12" sm="6" lg="4">
+            <gz-tag-picker
+              v-model="obj.customerAllowNotifyCSRAcceptedOutTags"
+              :readonly="formState.readOnly"
+              :label="$ay.t('NotTaggedWith')"
+              ref="customerAllowNotifyCSRAcceptedOutTags"
+              data-cy="customerAllowNotifyCSRAcceptedOutTags"
+              :error-messages="
+                form().serverErrors(
+                  this,
+                  'customerAllowNotifyCSRAcceptedOutTags'
+                )
+              "
+              @input="
+                fieldValueChanged('customerAllowNotifyCSRAcceptedOutTags')
+              "
+            ></gz-tag-picker>
+          </v-col>
+
+          <!-- ######################################################## -->
+          <v-col cols="12">
+            <div class="text-subtitle-1">
+              {{ $ay.t("NotifyEventCSRRejected") }}
+            </div>
+          </v-col>
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-checkbox
+              v-model="obj.customerAllowNotifyCSRRejected"
+              :readonly="formState.readOnly"
+              :label="$ay.t('Active')"
+              ref="customerAllowNotifyCSRRejected"
+              data-cy="customerAllowNotifyCSRRejected"
+              :error-messages="
+                form().serverErrors(this, 'customerAllowNotifyCSRRejected')
+              "
+              @change="fieldValueChanged('customerAllowNotifyCSRRejected')"
+            ></v-checkbox>
+          </v-col>
+          <v-col cols="12" sm="6" lg="4">
+            <gz-tag-picker
+              v-model="obj.customerAllowNotifyCSRRejectedInTags"
+              :readonly="formState.readOnly"
+              :label="$ay.t('TaggedWith')"
+              ref="customerAllowNotifyCSRRejectedInTags"
+              data-cy="customerAllowNotifyCSRRejectedInTags"
+              :error-messages="
+                form().serverErrors(
+                  this,
+                  'customerAllowNotifyCSRRejectedInTags'
+                )
+              "
+              @input="fieldValueChanged('customerAllowNotifyCSRRejectedInTags')"
+            ></gz-tag-picker>
+          </v-col>
+          <v-col cols="12" sm="6" lg="4">
+            <gz-tag-picker
+              v-model="obj.customerAllowNotifyCSRRejectedOutTags"
+              :readonly="formState.readOnly"
+              :label="$ay.t('NotTaggedWith')"
+              ref="customerAllowNotifyCSRRejectedOutTags"
+              data-cy="customerAllowNotifyCSRRejectedOutTags"
+              :error-messages="
+                form().serverErrors(
+                  this,
+                  'customerAllowNotifyCSRRejectedOutTags'
+                )
+              "
+              @input="
+                fieldValueChanged('customerAllowNotifyCSRRejectedOutTags')
+              "
+            ></gz-tag-picker>
+          </v-col>
+
+          <!-- ######################################################## -->
+          <v-col cols="12">
+            <div class="text-subtitle-1">
+              {{ $ay.t("NotifyEventWOCreatedForCustomer") }}
+            </div>
+          </v-col>
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-checkbox
+              v-model="obj.customerAllowNotifyWOCreated"
+              :readonly="formState.readOnly"
+              :label="$ay.t('Active')"
+              ref="customerAllowNotifyWOCreated"
+              data-cy="customerAllowNotifyWOCreated"
+              :error-messages="
+                form().serverErrors(this, 'customerAllowNotifyWOCreated')
+              "
+              @change="fieldValueChanged('customerAllowNotifyWOCreated')"
+            ></v-checkbox>
+          </v-col>
+          <v-col cols="12" sm="6" lg="4">
+            <gz-tag-picker
+              v-model="obj.customerAllowNotifyWOCreatedInTags"
+              :readonly="formState.readOnly"
+              :label="$ay.t('TaggedWith')"
+              ref="customerAllowNotifyWOCreatedInTags"
+              data-cy="customerAllowNotifyWOCreatedInTags"
+              :error-messages="
+                form().serverErrors(this, 'customerAllowNotifyWOCreatedInTags')
+              "
+              @input="fieldValueChanged('customerAllowNotifyWOCreatedInTags')"
+            ></gz-tag-picker>
+          </v-col>
+          <v-col cols="12" sm="6" lg="4">
+            <gz-tag-picker
+              v-model="obj.customerAllowNotifyWOCreatedOutTags"
+              :readonly="formState.readOnly"
+              :label="$ay.t('NotTaggedWith')"
+              ref="customerAllowNotifyWOCreatedOutTags"
+              data-cy="customerAllowNotifyWOCreatedOutTags"
+              :error-messages="
+                form().serverErrors(this, 'customerAllowNotifyWOCreatedOutTags')
+              "
+              @input="fieldValueChanged('customerAllowNotifyWOCreatedOutTags')"
+            ></gz-tag-picker>
+          </v-col>
+
+          <!-- **************************************************** -->
         </v-row>
       </v-form>
     </div>
@@ -308,45 +613,6 @@ export default {
     return {
       // formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
 
-      a: {
-        id: 1,
-        concurrency: 9339819,
-        searchCaseSensitiveOnly: false,
-        useInventory: true,
-        taxPartPurchaseId: 2,
-        taxPartSaleId: 2,
-        taxRateSaleId: 1,
-        workLaborScheduleDefaultMinutes: 0,
-        workOrderTravelDefaultMinutes: 0,
-        workOrderCompleteByAge: "00:00:00",
-        customerDefaultWorkOrderReportId: null,
-        customerServiceRequestInfoHTML: null,
-        customerAllowCSR: false,
-        customerAllowCSRInTags: null,
-        customerAllowCSROutTags: null,
-        customerAllowViewWO: false,
-        customerAllowViewWOInTags: null,
-        customerAllowViewWOOutTags: null,
-        customerAllowWOWiki: false,
-        customerAllowWOWikiInTags: null,
-        customerAllowWOWikiOutTags: null,
-        customerAllowUserSettings: false,
-        customerAllowUserSettingsInTags: null,
-        customerAllowUserSettingsOutTags: null,
-        customerAllowNotifyServiceImminent: false,
-        customerAllowNotifyServiceImminentInTags: null,
-        customerAllowNotifyServiceImminentOutTags: null,
-        customerAllowNotifyCSRAccepted: false,
-        customerAllowNotifyCSRAcceptedInTags: null,
-        customerAllowNotifyCSRAcceptedOutTags: null,
-        customerAllowNotifyCSRRejected: false,
-        customerAllowNotifyCSRRejectedInTags: null,
-        customerAllowNotifyCSRRejectedOutTags: null,
-        customerAllowNotifyWorkorderCreated: false,
-        customerAllowNotifyWorkorderCreatedInTags: null,
-        customerAllowNotifyWorkorderCreatedOutTags: null
-      },
-
       obj:
         //IMPORTANT NOTE: Fields that are NON NULLABLE in the schema for the table but *are* hideable **MUST** have a default value set here or else there will be no way to save the record
         //I.E. Serial, usertype fields, ACTIVE
@@ -385,9 +651,9 @@ export default {
           customerAllowNotifyCSRRejected: false,
           customerAllowNotifyCSRRejectedInTags: [],
           customerAllowNotifyCSRRejectedOutTags: [],
-          customerAllowNotifyWorkorderCreated: false,
-          customerAllowNotifyWorkorderCreatedInTags: [],
-          customerAllowNotifyWorkorderCreatedOutTags: []
+          customerAllowNotifyWOCreated: false,
+          customerAllowNotifyWOCreatedInTags: [],
+          customerAllowNotifyWOCreatedOutTags: []
         },
       formState: {
         ready: false,
@@ -610,6 +876,7 @@ async function fetchTranslatedText(vm) {
     "NotTaggedWith",
     "CustomerServiceRequestList",
     "WorkOrderList",
+    "UserSettings",
     "UserInterfaceSettings",
     "BusinessSettings",
     "CustomerAccessSettings",