diff --git a/src/components/AgentTable.vue b/src/components/AgentTable.vue
index 4311991..c9a9962 100644
--- a/src/components/AgentTable.vue
+++ b/src/components/AgentTable.vue
@@ -271,7 +271,7 @@
           <q-td>
             <q-checkbox
               v-if="props.row.alert_template && props.row.alert_template.always_text !== null"
-              :value="props.row.alert_template.always_text"
+              v-model="props.row.alert_template.always_text"
               disable
               dense
             >
@@ -281,14 +281,14 @@
             <q-checkbox
               v-else
               dense
-              @update:model-value="overdueAlert('text', props.row.id, props.row.overdue_text_alert)"
+              @update:model-value="overdueAlert('text', props.row, props.row.overdue_text_alert)"
               v-model="props.row.overdue_text_alert"
             />
           </q-td>
           <q-td>
             <q-checkbox
               v-if="props.row.alert_template && props.row.alert_template.always_email !== null"
-              :value="props.row.alert_template.always_email"
+              v-model="props.row.alert_template.always_email"
               disable
               dense
             >
@@ -298,14 +298,14 @@
             <q-checkbox
               v-else
               dense
-              @update:model-value="overdueAlert('email', props.row.id, props.row.overdue_email_alert)"
+              @update:model-value="overdueAlert('email', props.row, props.row.overdue_email_alert)"
               v-model="props.row.overdue_email_alert"
             />
           </q-td>
           <q-td>
             <q-checkbox
               v-if="props.row.alert_template && props.row.alert_template.always_alert !== null"
-              :value="props.row.alert_template.always_alert"
+              v-model="props.row.alert_template.always_alert"
               disable
               dense
             >
@@ -315,7 +315,7 @@
             <q-checkbox
               v-else
               dense
-              @update:model-value="overdueAlert('dashboard', props.row.id, props.row.overdue_dashboard_alert)"
+              @update:model-value="overdueAlert('dashboard', props.row, props.row.overdue_dashboard_alert)"
               v-model="props.row.overdue_dashboard_alert"
             />
           </q-td>
@@ -661,7 +661,7 @@ export default {
     agentRowSelected(agent_id) {
       this.$store.commit("setActiveRow", agent_id);
     },
-    overdueAlert(category, agent_id, alert_action) {
+    overdueAlert(category, agent, alert_action) {
       let db_field = "";
       if (category === "email") db_field = "overdue_email_alert";
       else if (category === "text") db_field = "overdue_text_alert";
@@ -673,12 +673,12 @@ export default {
       };
       const alertColor = !alert_action ? "positive" : "warning";
       this.$axios
-        .put(`/agents/${agent_id}/`, data)
+        .put(`/agents/${agent.agent_id}/`, data)
         .then(r => {
           this.$q.notify({
             color: alertColor,
             icon: "fas fa-check-circle",
-            message: `Overdue ${category} alerts ${action} on ${r.data}`,
+            message: `Overdue ${category} alerts ${action} on ${agent.hostname}`,
           });
         })
         .catch(e => {});
diff --git a/src/components/agents/AutomatedTasksTab.vue b/src/components/agents/AutomatedTasksTab.vue
index 4194857..ba8ec3c 100644
--- a/src/components/agents/AutomatedTasksTab.vue
+++ b/src/components/agents/AutomatedTasksTab.vue
@@ -116,8 +116,8 @@
           <!-- text alert -->
           <q-td>
             <q-checkbox
-              v-if="props.row.alert_template && !!props.row.alert_template.always_text"
-              :value="props.row.alert_template.always_text"
+              v-if="props.row.alert_template && props.row.alert_template.always_text !== null"
+              v-model="props.row.alert_template.always_text"
               disable
               dense
             >
@@ -135,8 +135,8 @@
           <!-- email alert -->
           <q-td>
             <q-checkbox
-              v-if="props.row.alert_template && !!props.row.alert_template.always_email"
-              :value="props.row.alert_template.always_email"
+              v-if="props.row.alert_template && props.row.alert_template.always_email !== null"
+              v-model="props.row.alert_template.always_email"
               disable
               dense
             >
@@ -154,8 +154,8 @@
           <!-- dashboard alert -->
           <q-td>
             <q-checkbox
-              v-if="props.row.alert_template && !!props.row.alert_template.always_alert"
-              :value="props.row.alert_template.always_alert"
+              v-if="props.row.alert_template && props.row.alert_template.always_alert !== null"
+              v-model="props.row.alert_template.always_alert"
               disable
               dense
             >
diff --git a/src/components/agents/ChecksTab.vue b/src/components/agents/ChecksTab.vue
index d6175c6..4f695fd 100644
--- a/src/components/agents/ChecksTab.vue
+++ b/src/components/agents/ChecksTab.vue
@@ -140,8 +140,8 @@
           <!-- text alert -->
           <q-td>
             <q-checkbox
-              v-if="props.row.alert_template && !!props.row.alert_template.always_text"
-              :value="props.row.alert_template.always_text"
+              v-if="props.row.alert_template && props.row.alert_template.always_text != null"
+              v-model="props.row.alert_template.always_text"
               disable
               dense
             >
@@ -159,8 +159,8 @@
           <!-- email alert -->
           <q-td>
             <q-checkbox
-              v-if="props.row.alert_template && !!props.row.alert_template.always_email"
-              :value="props.row.alert_template.always_email"
+              v-if="props.row.alert_template && props.row.alert_template.always_email != null"
+              v-model="props.row.alert_template.always_email"
               disable
               dense
             >
@@ -178,8 +178,8 @@
           <!-- dashboard alert -->
           <q-td>
             <q-checkbox
-              v-if="props.row.alert_template && !!props.row.alert_template.always_alert"
-              :value="props.row.alert_template.always_alert"
+              v-if="props.row.alert_template && props.row.alert_template.always_alert !== null"
+              v-model="props.row.alert_template.always_alert"
               disable
               dense
             >
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index 891c241..5dd3cab 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -661,6 +661,7 @@ export default {
           this.$axios
             .get(`/agents/?${param}`)
             .then(r => {
+              console.log(r.data);
               this.frame = r.data;
               this.$store.commit("AGENT_TABLE_LOADING", false);
             })