diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index c8e23ccf..8be7c0b6 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -383,12 +383,7 @@ todo: many biz objects are not using new PUT methodology
 
 
 
-CURRENTLY DOING: Work order notifications - sidetrack customer login initialize processing
-
-Sidetrack, case 3888 customer feature control in global settings required for customer centric notifications and others
-	see case, add to global object at server and also must return login availability and code that too now so it all works
-	also customer centric notifications and features need to be filtered through this security at the server now too
-
+CURRENTLY DOING: Work order notifications
 
 
 
@@ -411,7 +406,8 @@ Coded, tested, done:
 
 
 todo 3: workorder notifications to code and test:	
-
+	
+	WorkorderCompleted=30 was removed as redundant but fora  Customer they should not see any completed type status so this should actually be a thing I think if it was in v7
 	WorkorderCreatedForCustomer = 31, //*Service work order is created for Customer, only applies to that customer user notify sub for that customer, customer id is in conditional ID value for subscription
 	This is a v7 feature and needs to be replicated
 
diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js
index 888fe0c9..2fd2be3a 100644
--- a/ayanova/src/api/initialize.js
+++ b/ayanova/src/api/initialize.js
@@ -42,9 +42,6 @@ function initNavPanel() {
     //Set homePage in store to customer csr for this user type
     let CustomerHomePageSet = false;
 
-    //$store.state.customerRights
-    //{ "csr": true, "wo": true, "wowiki": true, "userSettings": true, "notifyServiceImminent": true, "notifyCSRAccepted": true, "notifyCSRRejected": true, "notifyWOCreated": true }
-
     //USER SETTINGS
     if (window.$gz.store.state.customerRights.userSettings == true) {
       sub.push({
@@ -58,12 +55,7 @@ function initNavPanel() {
       CustomerHomePageSet = true;
     }
 
-    if (
-      window.$gz.store.state.customerRights.notifyServiceImminent == true ||
-      window.$gz.store.state.customerRights.notifyCSRAccepted == true ||
-      window.$gz.store.state.customerRights.notifyCSRRejected == true ||
-      window.$gz.store.state.customerRights.notifyWOCreated == true
-    ) {
+    if (window.$gz.store.state.notifyAvailable) {
       sub.push({
         title: "NotifySubscriptionList",
         icon: "$ayiBullhorn",
diff --git a/ayanova/src/store.js b/ayanova/src/store.js
index 3f9be77a..46559368 100644
--- a/ayanova/src/store.js
+++ b/ayanova/src/store.js
@@ -83,6 +83,7 @@ export default new Vuex.Store({
           data.customerRights.notifyServiceImminent == true ||
           data.customerRights.notifyCSRAccepted == true ||
           data.customerRights.notifyCSRRejected == true ||
+          data.customerRights.notifyWOCompleted == true ||
           data.customerRights.notifyWOCreated == true;
       }
     },
diff --git a/ayanova/src/views/adm-global-settings.vue b/ayanova/src/views/adm-global-settings.vue
index f8cc1ea1..b5f7346f 100644
--- a/ayanova/src/views/adm-global-settings.vue
+++ b/ayanova/src/views/adm-global-settings.vue
@@ -567,6 +567,60 @@
             ></gz-tag-picker>
           </v-col>
 
+          <!-- ######################################################## -->
+          <v-col cols="12">
+            <div class="text-subtitle-1">
+              {{ $ay.t("NotifyEventWorkorderCompleted") }}
+            </div>
+          </v-col>
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-checkbox
+              v-model="obj.customerAllowNotifyWOCompleted"
+              :readonly="formState.readOnly"
+              :label="$ay.t('Active')"
+              ref="customerAllowNotifyWOCompleted"
+              data-cy="customerAllowNotifyWOCompleted"
+              :error-messages="
+                form().serverErrors(this, 'customerAllowNotifyWOCompleted')
+              "
+              @change="fieldValueChanged('customerAllowNotifyWOCompleted')"
+            ></v-checkbox>
+          </v-col>
+          <v-col cols="12" sm="6" lg="4">
+            <gz-tag-picker
+              v-model="obj.customerAllowNotifyWOCompletedInTags"
+              :readonly="formState.readOnly"
+              :label="$ay.t('TaggedWith')"
+              ref="customerAllowNotifyWOCompletedInTags"
+              data-cy="customerAllowNotifyWOCompletedInTags"
+              :error-messages="
+                form().serverErrors(
+                  this,
+                  'customerAllowNotifyWOCompletedInTags'
+                )
+              "
+              @input="fieldValueChanged('customerAllowNotifyWOCompletedInTags')"
+            ></gz-tag-picker>
+          </v-col>
+          <v-col cols="12" sm="6" lg="4">
+            <gz-tag-picker
+              v-model="obj.customerAllowNotifyWOCompletedOutTags"
+              :readonly="formState.readOnly"
+              :label="$ay.t('NotTaggedWith')"
+              ref="customerAllowNotifyWOCompletedOutTags"
+              data-cy="customerAllowNotifyWOCompletedOutTags"
+              :error-messages="
+                form().serverErrors(
+                  this,
+                  'customerAllowNotifyWOCompletedOutTags'
+                )
+              "
+              @input="
+                fieldValueChanged('customerAllowNotifyWOCompletedOutTags')
+              "
+            ></gz-tag-picker>
+          </v-col>
+
           <!-- **************************************************** -->
         </v-row>
       </v-form>
@@ -683,7 +737,10 @@ export default {
           customerAllowNotifyCSRRejectedOutTags: [],
           customerAllowNotifyWOCreated: false,
           customerAllowNotifyWOCreatedInTags: [],
-          customerAllowNotifyWOCreatedOutTags: []
+          customerAllowNotifyWOCreatedOutTags: [],
+          customerAllowNotifyWOCompleted: false,
+          customerAllowNotifyWOCompletedInTags: [],
+          customerAllowNotifyWOCompletedOutTags: []
         },
       formState: {
         ready: false,
@@ -927,6 +984,7 @@ async function fetchTranslatedText(vm) {
     "NotifyEventCSRAccepted",
     "NotifyEventCSRRejected",
     "NotifyEventWorkorderCreatedForCustomer",
+    "NotifyEventWorkorderCompleted",
     "CustomerAccessWorkOrderReport",
     "CSRInfoHTML"
   ]);
diff --git a/ayanova/src/views/home-notify-subscription.vue b/ayanova/src/views/home-notify-subscription.vue
index 13236759..bde670a7 100644
--- a/ayanova/src/views/home-notify-subscription.vue
+++ b/ayanova/src/views/home-notify-subscription.vue
@@ -775,10 +775,8 @@ async function populateSelectionLists(vm) {
           return window.$gz.store.state.customerRights.notifyCSRRejected;
         case 21:
           return window.$gz.store.state.customerRights.notifyServiceImminent;
-        // case 30://was workorder completed, removed due to thinking it's covered elsewhere but not really for customer who shouldn't see any other status available
-        //this is still up in the air and may need to be re-enabled here and at server
-        // //return window.$gz.store.state.customerRights.notifyCSRAccepted;
-        // return false;
+        case 30:
+          return window.$gz.store.state.customerRights.notifyWOCompleted;
         case 31:
           return window.$gz.store.state.customerRights.notifyWOCreated;
         default: