diff --git a/src/dispatch/static/dispatch/components.d.ts b/src/dispatch/static/dispatch/components.d.ts
index 5f5c864db1f8..499299563ebe 100644
--- a/src/dispatch/static/dispatch/components.d.ts
+++ b/src/dispatch/static/dispatch/components.d.ts
@@ -26,6 +26,7 @@ declare module '@vue/runtime-core' {
     MonacoEditor: typeof import('./src/components/MonacoEditor.vue')['default']
     NotificationSnackbarsWrapper: typeof import('./src/components/NotificationSnackbarsWrapper.vue')['default']
     PageHeader: typeof import('./src/components/PageHeader.vue')['default']
+    ParticipantAutoComplete: typeof import('./src/components/ParticipantAutoComplete.vue')['default']
     ParticipantSelect: typeof import('./src/components/ParticipantSelect.vue')['default']
     ProjectAutoComplete: typeof import('./src/components/ProjectAutoComplete.vue')['default']
     Refresh: typeof import('./src/components/Refresh.vue')['default']
diff --git a/src/dispatch/static/dispatch/src/components/AutoComplete.vue b/src/dispatch/static/dispatch/src/components/AutoComplete.vue
index 912cd93d0842..bfdfcf1d7f87 100644
--- a/src/dispatch/static/dispatch/src/components/AutoComplete.vue
+++ b/src/dispatch/static/dispatch/src/components/AutoComplete.vue
@@ -10,7 +10,7 @@
     :hide-no-data="false"
     v-model:search="search"
     v-model="selectedModel"
-    @update:modelValue="handleClear"
+    @update:model-value="handleClear"
   >
     <template #no-data>
       <v-list-item v-if="!loading">
@@ -21,11 +21,7 @@
     </template>
     <template #item="{ props, item }">
       <slot name="item" :props="props" :item="item">
-        <v-list-item
-          v-bind="props"
-          :title="item.title"
-          :subtitle="item.raw[subtitle]"
-        ></v-list-item>
+        <v-list-item v-bind="props" :title="item.title" :subtitle="item.raw[subtitle]" />
       </slot>
     </template>
     <template #append-item v-if="items.length < total.value">
@@ -72,7 +68,7 @@ export default {
   },
   emits: ["update:modelValue"],
   setup(props, { emit }) {
-    const { resource, title, identifier, subtitle, label, modelValue } = toRefs(props)
+    const { resource, modelValue } = toRefs(props)
 
     let loading = ref(false)
     let items = ref([])
@@ -80,7 +76,7 @@ export default {
     let currentPage = ref(1)
     let total = ref(0)
     let selectedModel = ref(modelValue.value)
-    let search = ref(modelValue.value ? modelValue.value[title.value] : "")
+    let search = ref(modelValue.value ? modelValue.value[props.title.value] : "")
 
     let debouncedGetData = debounce((searchVal, page = currentPage.value) => {
       loading.value = true
@@ -130,18 +126,21 @@ export default {
       emit(
         "update:modelValue",
         newVal
-          ? items.value.find((item) => item[identifier.value] == newVal[identifier.value])
+          ? items.value.find(
+              (item) => item[props.identifier.value] == newVal[props.identifier.value]
+            )
           : null
       )
     })
 
+    watch(modelValue, (newValue) => {
+      selectedModel.value = newValue
+      search.value = newValue ? newValue[props.title] : ""
+    })
+
     return {
       initials,
       items,
-      label,
-      title,
-      identifier,
-      subtitle,
       loading,
       handleClear,
       loadMore,
diff --git a/src/dispatch/static/dispatch/src/components/ParticipantSelect.vue b/src/dispatch/static/dispatch/src/components/ParticipantSelect.vue
index f7fc562aae18..a4ff901b074c 100644
--- a/src/dispatch/static/dispatch/src/components/ParticipantSelect.vue
+++ b/src/dispatch/static/dispatch/src/components/ParticipantSelect.vue
@@ -1,7 +1,7 @@
 <template>
   <v-autocomplete
     :items="items"
-    :label="labelProp"
+    :label="label"
     :loading="loading"
     v-model:search="search"
     clearable
@@ -12,7 +12,7 @@
     chips
     :hide-no-data="false"
     v-model="participant"
-    @update:modelValue="handleClear"
+    @update:model-value="handleClear"
   >
     <template #no-data>
       <v-list-item v-if="!loading">
@@ -41,7 +41,7 @@
 </template>
 
 <script>
-import { ref, watch, toRefs, onMounted } from "vue"
+import { ref, watch, onMounted } from "vue"
 import { initials } from "@/filters"
 import { debounce } from "lodash"
 
@@ -50,8 +50,7 @@ import IndividualApi from "@/individual/api"
 export default {
   name: "ParticipantSelect",
   props: {
-    labelProp: {
-      // Define the labelProp
+    label: {
       type: String,
       default: "Participant",
     },
@@ -61,11 +60,8 @@ export default {
     },
   },
   setup(props) {
-    const { labelProp } = toRefs(props) // toRefs make props reactive
-
     let loading = ref(false)
     let items = ref([])
-    console.log(items)
     let numItems = ref(10)
     let participant = ref({ ...props.initialValue })
     let currentPage = ref(1)
@@ -84,7 +80,6 @@ export default {
       }
 
       await IndividualApi.getAll(filterOptions).then((response) => {
-        console.log(response.data.items)
         items.value = response.data.items.map(function (x) {
           return { individual: x }
         })
@@ -127,7 +122,6 @@ export default {
       handleClear,
       initials,
       items,
-      labelProp,
       loading,
       loadMore,
       participant,
diff --git a/src/dispatch/static/dispatch/src/project/ProjectAutoComplete.vue b/src/dispatch/static/dispatch/src/project/ProjectAutoComplete.vue
index 119459616289..c9c1df1dadca 100644
--- a/src/dispatch/static/dispatch/src/project/ProjectAutoComplete.vue
+++ b/src/dispatch/static/dispatch/src/project/ProjectAutoComplete.vue
@@ -4,10 +4,9 @@
     title="name"
     identifier="id"
     subtitle="description"
-    v-model="modelValue"
+    v-model="internalModelValue"
     :label="label"
-  >
-  </AutoComplete>
+  />
 </template>
 
 <script>
@@ -22,7 +21,7 @@ export default {
   props: {
     modelValue: {
       type: Object,
-      default: () => null,
+      default: () => ({}),
     },
     label: {
       type: String,
@@ -47,7 +46,7 @@ export default {
     })
 
     return {
-      modelValue: internalModelValue,
+      internalModelValue,
     }
   },
 }