diff --git a/src/components/modals/checks/AddCpuLoadCheck.vue b/src/components/modals/checks/AddCpuLoadCheck.vue
index 85e5fc6..ef7b78b 100644
--- a/src/components/modals/checks/AddCpuLoadCheck.vue
+++ b/src/components/modals/checks/AddCpuLoadCheck.vue
@@ -1,35 +1,44 @@
 <template>
-    <q-card style="min-width: 400px">
-        <q-card-section class="row items-center">
-        <div class="text-h6">Add CPU Load Check</div>
-        <q-space />
-        <q-btn icon="close" flat round dense v-close-popup />
-        </q-card-section>
+  <q-card style="min-width: 400px">
+    <q-card-section class="row items-center">
+      <div class="text-h6">Add CPU Load Check</div>
+      <q-space />
+      <q-btn icon="close" flat round dense v-close-popup />
+    </q-card-section>
 
-        <q-form @submit.prevent="addCheck">
-            <q-card-section>
-                <q-input
-                outlined
-                v-model.number="threshold"
-                label="Alert if average utilization > (%)"
-                :rules="[ 
+    <q-form @submit.prevent="addCheck">
+      <q-card-section>
+        <q-input
+          outlined
+          v-model.number="threshold"
+          label="Alert if average utilization > (%)"
+          :rules="[ 
                     val => !!val || '*Required',
                     val => val >= 1 || 'Minimum threshold is 1',
                     val => val < 100 || 'Maximum threshold is 99'
                 ]"
-                />
-            </q-card-section>
-            <q-card-actions align="right">
-                <q-btn label="Add" color="primary" type="submit" />
-                <q-btn label="Cancel" v-close-popup />
-            </q-card-actions>
-        </q-form>
-    </q-card>
+        />
+      </q-card-section>
+      <q-card-section>
+        <q-select
+          outlined
+          dense
+          v-model="failure"
+          :options="failures"
+          label="Number of consecutive failures before alert"
+        />
+      </q-card-section>
+      <q-card-actions align="right">
+        <q-btn label="Add" color="primary" type="submit" />
+        <q-btn label="Cancel" v-close-popup />
+      </q-card-actions>
+    </q-form>
+  </q-card>
 </template>
 
 <script>
 import axios from "axios";
-import { mapState } from 'vuex';
+import { mapState } from "vuex";
 import mixins from "@/mixins/mixins";
 export default {
   name: "AddCpuLoadCheck",
@@ -37,7 +46,9 @@ export default {
   mixins: [mixins],
   data() {
     return {
-      threshold: 85
+      threshold: 85,
+      failure: 5,
+      failures: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
     };
   },
   methods: {
@@ -45,7 +56,8 @@ export default {
       const data = {
         pk: this.agentpk,
         check_type: "cpuload",
-        threshold: this.threshold
+        threshold: this.threshold,
+        failure: this.failure
       };
       axios
         .post("/checks/addstandardcheck/", data)
diff --git a/src/components/modals/checks/AddDiskSpaceCheck.vue b/src/components/modals/checks/AddDiskSpaceCheck.vue
index 0a9ecda..3699372 100644
--- a/src/components/modals/checks/AddDiskSpaceCheck.vue
+++ b/src/components/modals/checks/AddDiskSpaceCheck.vue
@@ -52,7 +52,7 @@ export default {
       threshold: 25,
       disks: [],
       firstdisk: "",
-      failure: 1,
+      failure: 2,
       failures: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
     };
   },
diff --git a/src/components/modals/checks/AddMemCheck.vue b/src/components/modals/checks/AddMemCheck.vue
index 66b82ff..946c5ef 100644
--- a/src/components/modals/checks/AddMemCheck.vue
+++ b/src/components/modals/checks/AddMemCheck.vue
@@ -1,35 +1,44 @@
 <template>
-    <q-card style="min-width: 400px">
-        <q-card-section class="row items-center">
-        <div class="text-h6">Add Memory Check</div>
-        <q-space />
-        <q-btn icon="close" flat round dense v-close-popup />
-        </q-card-section>
+  <q-card style="min-width: 400px">
+    <q-card-section class="row items-center">
+      <div class="text-h6">Add Memory Check</div>
+      <q-space />
+      <q-btn icon="close" flat round dense v-close-popup />
+    </q-card-section>
 
-        <q-form @submit.prevent="addCheck">
-            <q-card-section>
-                <q-input
-                outlined
-                v-model.number="threshold"
-                label="Alert if average memory usage > (%)"
-                :rules="[ 
+    <q-form @submit.prevent="addCheck">
+      <q-card-section>
+        <q-input
+          outlined
+          v-model.number="threshold"
+          label="Alert if average memory usage > (%)"
+          :rules="[ 
                     val => !!val || '*Required',
                     val => val >= 1 || 'Minimum threshold is 1',
                     val => val < 100 || 'Maximum threshold is 99'
                 ]"
-                />
-            </q-card-section>
-            <q-card-actions align="right">
-                <q-btn label="Add" color="primary" type="submit" />
-                <q-btn label="Cancel" v-close-popup />
-            </q-card-actions>
-        </q-form>
-    </q-card>
+        />
+      </q-card-section>
+      <q-card-section>
+        <q-select
+          outlined
+          dense
+          v-model="failure"
+          :options="failures"
+          label="Number of consecutive failures before alert"
+        />
+      </q-card-section>
+      <q-card-actions align="right">
+        <q-btn label="Add" color="primary" type="submit" />
+        <q-btn label="Cancel" v-close-popup />
+      </q-card-actions>
+    </q-form>
+  </q-card>
 </template>
 
 <script>
 import axios from "axios";
-import { mapState } from 'vuex';
+import { mapState } from "vuex";
 import mixins from "@/mixins/mixins";
 export default {
   name: "AddMemCheck",
@@ -37,7 +46,9 @@ export default {
   mixins: [mixins],
   data() {
     return {
-      threshold: 85
+      threshold: 85,
+      failure: 5,
+      failures: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
     };
   },
   methods: {
@@ -45,7 +56,8 @@ export default {
       const data = {
         pk: this.agentpk,
         check_type: "mem",
-        threshold: this.threshold
+        threshold: this.threshold,
+        failure: this.failure
       };
       axios
         .post("/checks/addstandardcheck/", data)
diff --git a/src/components/modals/checks/AddWinSvcCheck.vue b/src/components/modals/checks/AddWinSvcCheck.vue
index 46d5b5f..ae4c819 100644
--- a/src/components/modals/checks/AddWinSvcCheck.vue
+++ b/src/components/modals/checks/AddWinSvcCheck.vue
@@ -7,13 +7,22 @@
     </q-card-section>
 
     <q-form @submit.prevent="addCheck">
-      
       <q-card-section>
-        <q-select :rules="[val => !!val || '*Required']" dense outlined v-model="displayName" :options="svcDisplayNames" label="Service" @input="getRawName" />
-        
+        <q-select
+          :rules="[val => !!val || '*Required']"
+          dense
+          outlined
+          v-model="displayName"
+          :options="svcDisplayNames"
+          label="Service"
+          @input="getRawName"
+        />
       </q-card-section>
       <q-card-section>
-        <q-checkbox v-model="passIfStartPending" label="PASS if service is in 'Start Pending' mode" />
+        <q-checkbox
+          v-model="passIfStartPending"
+          label="PASS if service is in 'Start Pending' mode"
+        />
         <q-checkbox v-model="restartIfStopped" label="RESTART service if it's stopped" />
       </q-card-section>
       <q-card-section>
@@ -48,13 +57,13 @@ export default {
       rawName: [],
       passIfStartPending: false,
       restartIfStopped: false,
-      failure: 1,
+      failure: 2,
       failures: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
     };
   },
   computed: {
     svcDisplayNames() {
-      return this.servicesData.map(k => k.display_name).sort()
+      return this.servicesData.map(k => k.display_name).sort();
     }
   },
   methods: {
@@ -67,7 +76,9 @@ export default {
       }
     },
     getRawName() {
-      let svc = this.servicesData.find(k => k.display_name === this.displayName);
+      let svc = this.servicesData.find(
+        k => k.display_name === this.displayName
+      );
       this.rawName = [svc].map(j => j.name);
     },
     addCheck() {
@@ -92,6 +103,6 @@ export default {
   },
   mounted() {
     this.getServices();
-  },
+  }
 };
 </script>
\ No newline at end of file
diff --git a/src/components/modals/checks/EditCpuLoadCheck.vue b/src/components/modals/checks/EditCpuLoadCheck.vue
index ab3b9f2..d5f07cc 100644
--- a/src/components/modals/checks/EditCpuLoadCheck.vue
+++ b/src/components/modals/checks/EditCpuLoadCheck.vue
@@ -1,35 +1,44 @@
 <template>
-    <q-card style="min-width: 400px">
-        <q-card-section class="row items-center">
-        <div class="text-h6">Edit CPU Load Check</div>
-        <q-space />
-        <q-btn icon="close" flat round dense v-close-popup />
-        </q-card-section>
+  <q-card style="min-width: 400px">
+    <q-card-section class="row items-center">
+      <div class="text-h6">Edit CPU Load Check</div>
+      <q-space />
+      <q-btn icon="close" flat round dense v-close-popup />
+    </q-card-section>
 
-        <q-form @submit.prevent="editCheck">
-            <q-card-section>
-                <q-input
-                outlined
-                v-model.number="threshold"
-                label="Alert if average utilization > (%)"
-                :rules="[ 
+    <q-form @submit.prevent="editCheck">
+      <q-card-section>
+        <q-input
+          outlined
+          v-model.number="threshold"
+          label="Alert if average utilization > (%)"
+          :rules="[ 
                     val => !!val || '*Required',
                     val => val >= 1 || 'Minimum threshold is 1',
                     val => val < 100 || 'Maximum threshold is 99'
                 ]"
-                />
-            </q-card-section>
-            <q-card-actions align="right">
-                <q-btn label="Edit" color="primary" type="submit" />
-                <q-btn label="Cancel" v-close-popup />
-            </q-card-actions>
-        </q-form>
-    </q-card>
+        />
+      </q-card-section>
+      <q-card-section>
+        <q-select
+          outlined
+          dense
+          v-model="failure"
+          :options="failures"
+          label="Number of consecutive failures before alert"
+        />
+      </q-card-section>
+      <q-card-actions align="right">
+        <q-btn label="Edit" color="primary" type="submit" />
+        <q-btn label="Cancel" v-close-popup />
+      </q-card-actions>
+    </q-form>
+  </q-card>
 </template>
 
 <script>
 import axios from "axios";
-import { mapState } from 'vuex';
+import { mapState } from "vuex";
 import mixins from "@/mixins/mixins";
 export default {
   name: "EditCpuLoadCheck",
@@ -37,20 +46,26 @@ export default {
   mixins: [mixins],
   data() {
     return {
-      threshold: null
+      threshold: null,
+      failure: null,
+      failures: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
     };
   },
   methods: {
     getCheck() {
       axios
         .get(`/checks/getstandardcheck/cpuload/${this.editCheckPK}/`)
-        .then(r => this.threshold = r.data.cpuload);
+        .then(r => {
+          this.threshold = r.data.cpuload;
+          this.failure = r.data.failures;
+        });
     },
     editCheck() {
       const data = {
         pk: this.editCheckPK,
         check_type: "cpuload",
-        threshold: this.threshold
+        threshold: this.threshold,
+        failure: this.failure
       };
       axios
         .patch("/checks/editstandardcheck/", data)
diff --git a/src/components/modals/checks/EditMemCheck.vue b/src/components/modals/checks/EditMemCheck.vue
index 6cbca8b..0f64497 100644
--- a/src/components/modals/checks/EditMemCheck.vue
+++ b/src/components/modals/checks/EditMemCheck.vue
@@ -1,35 +1,44 @@
 <template>
-    <q-card style="min-width: 400px">
-        <q-card-section class="row items-center">
-        <div class="text-h6">Edit Memory Check</div>
-        <q-space />
-        <q-btn icon="close" flat round dense v-close-popup />
-        </q-card-section>
+  <q-card style="min-width: 400px">
+    <q-card-section class="row items-center">
+      <div class="text-h6">Edit Memory Check</div>
+      <q-space />
+      <q-btn icon="close" flat round dense v-close-popup />
+    </q-card-section>
 
-        <q-form @submit.prevent="editCheck">
-            <q-card-section>
-                <q-input
-                outlined
-                v-model.number="threshold"
-                label="Alert if average memory usage > (%)"
-                :rules="[ 
+    <q-form @submit.prevent="editCheck">
+      <q-card-section>
+        <q-input
+          outlined
+          v-model.number="threshold"
+          label="Alert if average memory usage > (%)"
+          :rules="[ 
                     val => !!val || '*Required',
                     val => val >= 1 || 'Minimum threshold is 1',
                     val => val < 100 || 'Maximum threshold is 99'
                 ]"
-                />
-            </q-card-section>
-            <q-card-actions align="right">
-                <q-btn label="Edit" color="primary" type="submit" />
-                <q-btn label="Cancel" v-close-popup />
-            </q-card-actions>
-        </q-form>
-    </q-card>
+        />
+      </q-card-section>
+      <q-card-section>
+        <q-select
+          outlined
+          dense
+          v-model="failure"
+          :options="failures"
+          label="Number of consecutive failures before alert"
+        />
+      </q-card-section>
+      <q-card-actions align="right">
+        <q-btn label="Edit" color="primary" type="submit" />
+        <q-btn label="Cancel" v-close-popup />
+      </q-card-actions>
+    </q-form>
+  </q-card>
 </template>
 
 <script>
 import axios from "axios";
-import { mapState } from 'vuex';
+import { mapState } from "vuex";
 import mixins from "@/mixins/mixins";
 export default {
   name: "EditMemCheck",
@@ -37,20 +46,24 @@ export default {
   mixins: [mixins],
   data() {
     return {
-      threshold: null
+      threshold: null,
+      failure: null,
+      failures: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
     };
   },
   methods: {
     getCheck() {
-      axios
-        .get(`/checks/getstandardcheck/mem/${this.editCheckPK}/`)
-        .then(r => this.threshold = r.data.threshold);
+      axios.get(`/checks/getstandardcheck/mem/${this.editCheckPK}/`).then(r => {
+        this.threshold = r.data.threshold;
+        this.failure = r.data.failures;
+      });
     },
     editCheck() {
       const data = {
         pk: this.editCheckPK,
         check_type: "mem",
-        threshold: this.threshold
+        threshold: this.threshold,
+        failure: this.failure
       };
       axios
         .patch("/checks/editstandardcheck/", data)