diff --git a/ayanova/src/components/work-order-items.vue b/ayanova/src/components/work-order-items.vue
index aebfa161..0b9ee401 100644
--- a/ayanova/src/components/work-order-items.vue
+++ b/ayanova/src/components/work-order-items.vue
@@ -40,7 +40,7 @@
               <v-divider></v-divider>
               <v-subheader>{{ $ay.t("Add") }}</v-subheader>
               <v-list-item
-                v-if="pvm.subRights.units.create"
+                v-if="canAddUnit"
                 @click="newSubItem($ay.ayt.WorkOrderItemUnit)"
               >
                 <v-list-item-icon>
@@ -387,13 +387,7 @@
           />
         </v-col>
 
-        <v-col
-          cols="12"
-          v-if="
-            pvm.subRights.scheduledUsers.visible &&
-              form().showMe(this, 'WorkOrderItemScheduledUserList')
-          "
-        >
+        <v-col cols="12" v-show="showScheduledUsers">
           <GzWoItemScheduledUsers
             v-model="value"
             :pvm="pvm"
@@ -1044,13 +1038,25 @@ and it's probably not a big list to fill anyway
         this.pvm.subRights.items.delete
       );
     },
+    canAddUnit: function() {
+      return (
+        this.pvm.subRights.units.create &&
+        this.form().showMe(this, "WorkOrderItemUnitList")
+      );
+    },
     showUnits: function() {
       return (
         this.pvm.subRights.units.visible &&
         this.form().showMe(this, "WorkOrderItemUnitList") &&
-        this.value.items[this.activeItemIndex].units &&
         this.value.items[this.activeItemIndex].units.length > 0
       );
+    },
+    showScheduledUsers: function() {
+      return (
+        this.pvm.subRights.scheduledUsers.visible &&
+        this.form().showMe(this, "WorkOrderItemScheduledUserList") &&
+        this.value.items[this.activeItemIndex].scheduledUsers.length > 0
+      );
     }
   }
 };