diff --git a/src/components/agents/ChecksTab.vue b/src/components/agents/ChecksTab.vue
index 4325aa0..d6175c6 100644
--- a/src/components/agents/ChecksTab.vue
+++ b/src/components/agents/ChecksTab.vue
@@ -271,7 +271,7 @@
             }}</span>
           </q-td>
           <q-td>{{ props.row.last_run || "Never" }}</q-td>
-          <q-td v-if="props.row.assigned_task !== null && props.row.assigned_task.length > 1"
+          <q-td v-if="!!props.row.assigned_task && props.row.assigned_task.length > 1"
             >{{ props.row.assigned_task.length }} Tasks</q-td
           >
           <q-td v-else-if="props.row.assigned_task">{{ props.row.assigned_task.name }}</q-td>
diff --git a/src/components/automation/PolicyAutomatedTasksTab.vue b/src/components/automation/PolicyAutomatedTasksTab.vue
index 332b0ba..03ab28f 100644
--- a/src/components/automation/PolicyAutomatedTasksTab.vue
+++ b/src/components/automation/PolicyAutomatedTasksTab.vue
@@ -154,8 +154,7 @@
                 >See Status</span
               >
             </q-td>
-            <q-td v-if="props.row.assigned_check">{{ props.row.assigned_check.readable_desc }}</q-td>
-            <q-td v-else></q-td>
+            <q-td>{{ props.row.check_name }}</q-td>
           </q-tr>
         </template>
       </q-table>
@@ -200,9 +199,9 @@ export default {
           sortable: true,
         },
         {
-          name: "assignedcheck",
+          name: "check_name",
           label: "Assigned Check",
-          field: "assigned_check",
+          field: "check_name",
           align: "left",
           sortable: true,
         },
diff --git a/src/components/automation/PolicyChecksTab.vue b/src/components/automation/PolicyChecksTab.vue
index 774384d..3c4115d 100644
--- a/src/components/automation/PolicyChecksTab.vue
+++ b/src/components/automation/PolicyChecksTab.vue
@@ -161,10 +161,10 @@
                 >See Status</span
               >
             </q-td>
-            <q-td v-if="!!props.row.assignedtask && props.row.assignedtask.length === 1">{{
-              props.row.assignedtask[0].name
-            }}</q-td>
-            <q-td v-else-if="!!props.row.assignedtask">{{ props.row.assignedtask.length }} Tasks</q-td>
+            <q-td v-if="!!props.row.assigned_task && props.row.assigned_task.length > 1"
+              >{{ props.row.assigned_task.length }} Tasks</q-td
+            >
+            <q-td v-else-if="!!props.row.assigned_task">{{ props.row.assigned_task.name }}</q-td>
             <q-td v-else></q-td>
           </q-tr>
         </template>
diff --git a/src/components/tasks/AddAutomatedTask.vue b/src/components/tasks/AddAutomatedTask.vue
index c3d39e4..c59fabb 100644
--- a/src/components/tasks/AddAutomatedTask.vue
+++ b/src/components/tasks/AddAutomatedTask.vue
@@ -252,6 +252,7 @@ export default {
     const loading = ref(false);
 
     async function submit() {
+      console.log(task.value);
       if (!step1Done.value || !step2Done.value) {
         notifyError("Some steps are incomplete");
         return;
@@ -289,7 +290,7 @@ export default {
     const step1Done = computed(() => {
       return (
         (!!script.value && !!task.value.name && !!defaultTimeout.value && !collector.value) ||
-        (!!script.value && !!task.value.name && !!defaultTimeout.value && collector.value && task.value.custom_field)
+        (!!script.value && !!task.value.name && !!defaultTimeout.value && collector.value && !!task.value.custom_field)
       );
     });