diff --git a/ayanova/src/router.js b/ayanova/src/router.js
index ee7cfe2d..b1791797 100644
--- a/ayanova/src/router.js
+++ b/ayanova/src/router.js
@@ -141,6 +141,15 @@ export default new Router({
           /* webpackChunkName: "ay-common" */ "./views/home-notify-subscriptions.vue"
         )
     },
+    {
+      path: "/home-notify-subscriptions/:recordid",
+      name: "home-notify-subscription",
+      component: () =>
+        import(
+          /* webpackChunkName: "ay-common" */ "./views/home-notify-subscription.vue"
+        )
+    },
+
     {
       path: "/cust-customers",
       name: "cust-customers",
diff --git a/ayanova/src/views/home-notify-subscription.vue b/ayanova/src/views/home-notify-subscription.vue
new file mode 100644
index 00000000..f561d933
--- /dev/null
+++ b/ayanova/src/views/home-notify-subscription.vue
@@ -0,0 +1,538 @@
+<template>
+  <v-container fluid>
+    <v-row v-if="formState.ready">
+      <v-col>
+        <v-form ref="form">
+          <v-row>
+            <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
+            {{ obj }}
+          </v-row>
+        </v-form>
+      </v-col>
+    </v-row>
+    <template v-if="!formState.ready">
+      <v-progress-circular
+        indeterminate
+        color="primary"
+        :size="60"
+      ></v-progress-circular>
+    </template>
+  </v-container>
+</template>
+
+<script>
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////
+/*  Xeslint-disable    */
+//
+////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//
+const FORM_KEY = "home-notify-subscription";
+const API_BASE_URL = "notify-subscription/";
+const FORM_CUSTOM_TEMPLATE_KEY = "home-notify-subscription";
+
+export default {
+  async created() {
+    //created is called when the route is updated to show a new record even though we don't need to re-init again
+    let vm = this;
+    try {
+      await initForm(vm);
+
+      vm.rights = window.$gz.role.getRights(window.$gz.type.NotifySubscription);
+      vm.formState.readOnly = !vm.rights.change;
+      window.$gz.eventBus.$on("menu-click", clickHandler);
+
+      //id 0 means create a new record don't load one
+      if (vm.$route.params.recordid != 0) {
+        //is there already an obj from a prior operation?
+        if (this.$route.params.obj) {
+          //yes, no need to fetch it
+          this.obj = this.$route.params.obj;
+          vm.formState.loading = false; //here we handle it immediately
+        } else {
+          await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
+        }
+      } else {
+        vm.formState.loading = false; //here we handle it immediately
+      }
+      //set initial form status
+      window.$gz.form.setFormState({
+        vm: vm,
+        dirty: false,
+        valid: true
+      });
+
+      generateMenu(vm);
+    } catch (error) {
+      window.$gz.errorHandler.handleFormError(error, vm);
+    } finally {
+      vm.formState.ready = true;
+    }
+  },
+  async beforeRouteLeave(to, from, next) {
+    if (!this.formState.dirty || JUST_DELETED) {
+      next();
+      return;
+    }
+    if ((await window.$gz.dialog.confirmLeaveUnsaved()) === true) {
+      next();
+    } else {
+      next(false);
+    }
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  data() {
+    return {
+      formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
+      selectLists: {
+        usertypes: []
+      },
+      /*   public long Id { get; set; }
+        public uint Concurrency { get; set; }
+
+        [Required]
+        public long UserId { get; set; }
+        public AyaType? AyaType { get; set; }
+        [Required]
+        public NotifyEventType EventType { get; set; }
+        public TimeSpan? AdvanceNotice { get; set; }   //Note: I've been doing nullable wrong sort of: https://stackoverflow.com/a/29149207/8939 
+        public long? IdValue { get; set; }
+        public decimal? DecValue { get; set; }
+        [Required]
+        public NotifyDeliveryMethod DeliveryMethod { get; set; }
+        public string DeliveryAddress { get; set; }
+        public long? AttachReportId { get; set; }
+        public List<string> InTags { get; set; }
+        public List<string> OutTags { get; set; } */
+      obj: {
+        id: 0,
+        concurrency: 0,
+        active: false,
+        name: null,
+        roles: null,
+        userType: 3,
+        employeeNumber: null,
+        notes: null,
+        customerId: null,
+        headOfficeId: null,
+        subVendorId: null,
+        wiki: null,
+        customFields: "{}",
+        tags: [],
+        lastLogin: null
+      },
+      login: null,
+      password: null,
+      reveal: true,
+      formState: {
+        ready: false,
+        dirty: false,
+        valid: true,
+        readOnly: false,
+        loading: true,
+        errorBoxMessage: null,
+        appError: null,
+        serverError: {}
+      },
+      rights: window.$gz.role.defaultRightsObject(),
+      ayaType: window.$gz.type.NotifySubscription
+    };
+  },
+  //WATCHERS
+  watch: {
+    formState: {
+      handler: function(val) {
+        if (this.formState.loading) {
+          return;
+        }
+
+        //enable / disable save button
+        if (val.dirty && val.valid && !val.readOnly) {
+          window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
+        } else {
+          window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
+        }
+
+        //enable / disable duplicate / new button
+        if (!val.dirty && val.valid && !val.readOnly) {
+          window.$gz.eventBus.$emit(
+            "menu-enable-item",
+            FORM_KEY + ":duplicate"
+          );
+          window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":new");
+        } else {
+          window.$gz.eventBus.$emit(
+            "menu-disable-item",
+            FORM_KEY + ":duplicate"
+          );
+          window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":new");
+        }
+      },
+      deep: true
+    }
+  },
+
+  methods: {
+    canSave: function() {
+      return this.formState.valid && this.formState.dirty;
+    },
+    canDuplicate: function() {
+      return this.formState.valid && !this.formState.dirty;
+    },
+    ayaTypes: function() {
+      return window.$gz.type;
+    },
+    form() {
+      return window.$gz.form;
+    },
+    fieldValueChanged(ref) {
+      if (
+        this.formState.ready &&
+        !this.formState.loading &&
+        !this.formState.readOnly
+      ) {
+        window.$gz.form.fieldValueChanged(this, ref);
+      }
+    },
+    async getDataFromApi(recordId) {
+      let vm = this;
+      vm.formState.loading = true;
+
+      if (!recordId) {
+        throw FORM_KEY + "::getDataFromApi -> Missing recordID!";
+      }
+      let url = API_BASE_URL + recordId;
+      try {
+        window.$gz.form.deleteAllErrorBoxErrors(vm);
+        let res = await window.$gz.api.get(url);
+
+        if (res.error) {
+          //Not found?
+          if (res.error.code == "2010") {
+            //notify not found error then navigate backwards
+            window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010"));
+            // navigate backwards
+            window.$gz._.delay(function() {
+              vm.$router.go(-1);
+            }, 2000);
+          }
+          vm.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(vm);
+          vm.formState.loading = false;
+        } else {
+          vm.obj = res.data;
+          //modify the menu as necessary
+          generateMenu(vm);
+
+          //Update the form status
+          window.$gz.form.setFormState({
+            vm: vm,
+            dirty: false,
+            valid: true,
+            loading: false
+          });
+        }
+      } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, vm);
+        vm.formState.loading = false;
+      }
+    },
+    async submit() {
+      let vm = this;
+      if (vm.canSave == false) {
+        return;
+      }
+
+      try {
+        vm.formState.loading = true;
+        let url = API_BASE_URL;
+        //clear any errors vm might be around from previous submit
+        window.$gz.form.deleteAllErrorBoxErrors(vm);
+
+        //add in password and login if changed
+        let submitObject = vm.obj;
+        if (vm.password != null && vm.password != "") {
+          submitObject.password = vm.password;
+        }
+        if (vm.login != null && vm.login != "") {
+          submitObject.login = vm.login;
+        }
+        if (submitObject.roles == null) {
+          submitObject.roles = 0;
+        }
+        let res = await window.$gz.api.upsert(url, submitObject);
+        if (res.error) {
+          vm.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(vm);
+        } else {
+          //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
+          if (res.data.id) {
+            //POST - whole new object returned
+            vm.obj = res.data;
+            //Change URL to new record
+            //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
+
+            this.$router.push({
+              name: "adm-user",
+              params: {
+                recordid: res.data.id,
+                obj: res.data //Pass data object to new form
+              }
+            });
+          } else {
+            //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
+            //Handle "put" of an existing record (UPDATE)
+            vm.obj.concurrency = res.data.concurrency;
+          }
+
+          //Update the form status
+          window.$gz.form.setFormState({
+            vm: vm,
+            dirty: false,
+            valid: true
+          });
+        }
+      } catch (ex) {
+        window.$gz.errorHandler.handleFormError(ex, vm);
+      } finally {
+        vm.formState.loading = false;
+      }
+    },
+    async remove() {
+      let vm = this;
+      try {
+        let dialogResult = await window.$gz.dialog.confirmDelete();
+        if (dialogResult != true) {
+          return;
+        }
+
+        //do the delete
+        vm.formState.loading = true;
+        //No need to delete a new record, just abandon it...
+        if (vm.$route.params.recordid == 0) {
+          //this should not get offered for delete but to be safe and clear just in case:
+          JUST_DELETED = true;
+          // navigate backwards
+          vm.$router.go(-1);
+        } else {
+          let url = API_BASE_URL + vm.$route.params.recordid;
+
+          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          let res = await window.$gz.api.remove(url);
+          if (res.error) {
+            vm.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(vm);
+          } else {
+            //workaround to prevent warning about leaving dirty record
+            //For some reason I couldn't just reset isdirty in formstate
+            JUST_DELETED = true;
+            // navigate backwards
+            vm.$router.go(-1);
+          }
+        }
+      } catch (ex) {
+        window.$gz.errorHandler.handleFormError(ex, vm);
+      } finally {
+        vm.formState.loading = false;
+      }
+    },
+    async duplicate() {
+      let vm = this;
+      if (!vm.canDuplicate || vm.$route.params.recordid == 0) {
+        return;
+      }
+      vm.formState.loading = true;
+      let url = API_BASE_URL + "duplicate/" + vm.$route.params.recordid;
+
+      try {
+        window.$gz.form.deleteAllErrorBoxErrors(vm);
+        let res = await window.$gz.api.upsert(url);
+        if (res.error) {
+          vm.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(vm);
+        } else {
+          //Navigate to new record
+          this.$router.push({
+            name: "home-notify-subscription",
+            params: {
+              recordid: res.data.id,
+              obj: res.data // pass data object to new form
+            }
+          });
+        }
+      } catch (ex) {
+        window.$gz.errorHandler.handleFormError(ex, vm);
+      } finally {
+        vm.formState.loading = false;
+      }
+    }
+  }
+};
+
+/////////////////////////////
+//
+//
+async function clickHandler(menuItem) {
+  if (!menuItem) {
+    return;
+  }
+  let m = window.$gz.menu.parseMenuItem(menuItem);
+  if (m.owner == FORM_KEY && !m.disabled) {
+    switch (m.key) {
+      case "save":
+        m.vm.submit();
+        break;
+      case "delete":
+        m.vm.remove();
+        break;
+      case "new":
+        m.vm.$router.push({
+          name: "home-notify-subscription",
+          params: { recordid: 0, new: true }
+        });
+        break;
+      case "duplicate":
+        m.vm.duplicate();
+        break;
+      //   case "report":
+      //     if (m.id != null) {
+      //       //last report selected
+      //       m.vm.$router.push({
+      //         name: "ay-report",
+      //         params: { recordid: m.id, ayatype: window.$gz.type.NotifySubscription }
+      //       });
+      //     } else {
+      //       //general report selector chosen
+      //       let res = await m.vm.$refs.reportSelector.open();
+
+      //       //if null for no selection
+      //       //just bail out
+      //       if (res == null) {
+      //         return;
+      //       }
+      //       //persist last report selected
+      //       window.$gz.form.setLastReport(FORM_KEY, res);
+
+      //       //Now open the report viewer...
+      //       m.vm.$router.push({
+      //         name: "ay-report",
+      //         params: { recordid: res.id, ayatype: window.$gz.type.NotifySubscription }
+      //       });
+      //     }
+      //     break;
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  let menuOptions = {
+    isMain: false,
+    icon: "fa-bullhorn",
+    title: "NotifySubscription",
+    helpUrl: "form-home-notify-subscription",
+    formData: {
+      ayaType: window.$gz.type.NotifySubscription,
+      recordId: vm.$route.params.recordid,
+      formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY
+    },
+    menuItems: []
+  };
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "Save",
+      icon: "fa-save",
+      surface: true,
+      key: FORM_KEY + ":save",
+      vm: vm
+    });
+  }
+
+  if (vm.rights.delete && vm.$route.params.recordid != 0) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "fa-trash-alt",
+      surface: true,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
+
+  //   //STUB REPORTS
+  //   //Report not Print, print is a further option
+  //   menuOptions.menuItems.push({
+  //     title: "Report",
+  //     icon: "fa-file-alt",
+  //     key: FORM_KEY + ":report",
+  //     vm: vm
+  //   });
+
+  //   //get last report selected
+  //   let lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  //   if (lastReport != null) {
+  //     menuOptions.menuItems.push({
+  //       title: lastReport.name,
+  //       icon: "fa-file-alt",
+  //       key: FORM_KEY + ":report:" + lastReport.id,
+  //       vm: vm
+  //     });
+  //   }
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "New",
+      icon: "fa-plus",
+      key: FORM_KEY + ":new",
+      vm: vm
+    });
+  }
+
+  if (vm.rights.change && vm.$route.params.recordid != 0) {
+    menuOptions.menuItems.push({
+      title: "Duplicate",
+      icon: "fa-clone",
+      key: FORM_KEY + ":duplicate",
+      vm: vm
+    });
+  }
+
+  window.$gz.eventBus.$emit("menu-change", menuOptions);
+}
+
+let JUST_DELETED = false;
+
+/////////////////////////////////
+//
+//
+async function initForm(vm) {
+  await fetchTranslatedText(vm);
+  await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY);
+  await populateSelectionLists(vm);
+}
+
+//////////////////////////////////////////////////////////
+//
+// Ensures UI translated text is available
+//
+async function fetchTranslatedText(vm) {
+  await window.$gz.translation.cacheTranslations([]);
+}
+
+//////////////////////
+//
+//
+async function populateSelectionLists(vm) {
+  //ensure the pick lists required are pre-fetched
+  await window.$gz.enums.fetchEnumList("usertype");
+  vm.selectLists.usertypes = window.$gz.enums.getSelectionList("usertype");
+}
+</script>
diff --git a/ayanova/src/views/home-notify-subscriptions.vue b/ayanova/src/views/home-notify-subscriptions.vue
index d8c0c0e8..d5f9deb1 100644
--- a/ayanova/src/views/home-notify-subscriptions.vue
+++ b/ayanova/src/views/home-notify-subscriptions.vue
@@ -59,7 +59,7 @@ async function clickHandler(menuItem) {
     switch (m.key) {
       case "new":
         m.vm.$router.push({
-          name: "notification-subscription-edit",
+          name: "home-notify-subscription",
           params: { recordid: 0 }
         });
         break;