diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index f84045b1..678ac5ff 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -5,6 +5,8 @@
 
 MISC ITEMS THAT CAME UP
 
+todo: picklist preId fetch should *always* return the name even if inactive
+	http://localhost:7575/api/v8.0/pick-list/List?ayaType=15&preId=3
 
 
 todo: if list view not found / deleted when grid list form is opened rather than erroring with object/object it should 
diff --git a/ayanova/src/views/cust-customer.vue b/ayanova/src/views/cust-customer.vue
index b8ff100a..535725bb 100644
--- a/ayanova/src/views/cust-customer.vue
+++ b/ayanova/src/views/cust-customer.vue
@@ -815,13 +815,13 @@ export default {
       },
       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
+        //I.E. Serial, usertype fields, ACTIVE
         //Also, if it's a non-nullable Enum backed field then it should have a valid selection i.e. not zero if there is no zero
         {
           id: 0,
           concurrency: 0,
           name: null,
-          active: null,
+          active: false,
           notes: null,
           wiki: null,
           customFields: "{}",
diff --git a/ayanova/src/views/cust-head-office.vue b/ayanova/src/views/cust-head-office.vue
index 66b539c4..9d2916e9 100644
--- a/ayanova/src/views/cust-head-office.vue
+++ b/ayanova/src/views/cust-head-office.vue
@@ -729,7 +729,7 @@ export default {
           id: 0,
           concurrency: 0,
           name: null,
-          active: null,
+          active: false,
           notes: null,
           wiki: null,
           customFields: "{}",
@@ -908,7 +908,7 @@ export default {
             //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: "customer-edit",
+              name: "head-office-edit",
               params: {
                 recordid: res.data.id,
                 obj: res.data // Pass data object to new form
@@ -999,7 +999,7 @@ export default {
         } else {
           //Navigate to new record
           this.$router.push({
-            name: "customer-edit",
+            name: "head-office-edit",
             params: {
               recordid: res.data.id,
               obj: res.data // Pass data object to new form
@@ -1033,7 +1033,7 @@ export default {
       }
       this.$router.push({
         name: "cust-user",
-        params: { recordid: 0, customerid: this.obj.id }
+        params: { recordid: 0, headofficeid: this.obj.id }
       });
     },
     contactsRowClick(item) {
@@ -1235,7 +1235,7 @@ async function clickHandler(menuItem) {
         break;
       case "new":
         m.vm.$router.push({
-          name: "customer-edit",
+          name: "head-office-edit",
           params: { recordid: 0, new: true }
         });
         break;
@@ -1284,12 +1284,7 @@ async function clickHandler(menuItem) {
           postCode: m.vm.obj.postCode
         });
         break;
-      case "HeadOfficeNoteList":
-        m.vm.$router.push({
-          name: "customer-notes",
-          params: { customerid: m.vm.obj.id, customername: m.vm.obj.name }
-        });
-        break;
+
       default:
         window.$gz.eventBus.$emit(
           "notify-warning",
diff --git a/ayanova/src/views/cust-user.vue b/ayanova/src/views/cust-user.vue
index 120dd1d5..49f73053 100644
--- a/ayanova/src/views/cust-user.vue
+++ b/ayanova/src/views/cust-user.vue
@@ -435,6 +435,7 @@ export default {
           vm.$route.params.headofficeid &&
           vm.$route.params.headofficeid != 0
         ) {
+          console.log(vm.$route.params.headofficeid);
           vm.obj.headOfficeId = vm.$route.params.headofficeid;
           vm.obj.userType = 4;
         } else {