diff --git a/web/src/components/Autocomplete.vue b/web/src/components/Autocomplete.vue
new file mode 100644
index 0000000..610aba3
--- /dev/null
+++ b/web/src/components/Autocomplete.vue
@@ -0,0 +1,73 @@
+<script lang="ts">
+import { defineComponent } from "vue"
+
+interface Payee {
+    ID : string
+    Name : string
+}
+
+export default defineComponent({
+    data() {
+        return {
+            SelectedID: "",
+            SearchQuery: this.modelValue || "",
+            Suggestions: new Array<Payee>(),
+        }
+    },
+    props: ["modelValue"],
+    watch: {
+        SearchQuery() {
+            this.LoadSuggestions(this.$data.SearchQuery);
+        }
+    },
+    methods: {
+        saveTransaction(e : MouseEvent) {
+            e.preventDefault();
+        },
+        LoadSuggestions(text : string) {
+            this.$emit('update:modelValue', text);
+            if (text == ""){
+                this.$data.Suggestions = [];
+                return;
+            }
+            
+            fetch("/api/v1/budget/" + this.$store.getters.CurrentBudget.ID + "/autocomplete/payees?s=" + text, {
+                headers: this.$store.getters.AuthHeaders
+            }) .then(x=>x.json())
+            .then(x => {
+                let payees = x || [];
+                if(payees.length > 10){
+                    payees = payees.slice(0, 10);
+                }
+                this.$data.Suggestions = payees;
+            });
+        },
+        selectSuggestion(e : MouseEvent) {
+            const target = (<HTMLInputElement>e.target);
+            const valueAttribute = target.attributes.getNamedItem("value");
+            let selectedID = "";
+            if(valueAttribute != null)
+                selectedID = valueAttribute.value;
+            this.$data.SelectedID = selectedID;
+            this.$data.Suggestions = [];
+            this.$emit('update:modelValue', selectedID);
+        },
+        clearPayee() {
+            this.$data.SelectedID = "";
+            this.$emit('update:modelValue', this.$data.SearchQuery);
+        }
+    }
+})
+</script>
+
+<template>
+    <div>
+        <input v-if="SelectedID == ''" v-model="SearchQuery" />
+        <span @click="clearPayee" v-if="SelectedID != ''">Selected: {{SelectedID}}</span>
+        <div v-if="Suggestions.length > 0" class="absolute bg-gray-400 w-64 p-2">
+            <span v-for="suggestion in Suggestions" class="block" @click="selectSuggestion" :value="suggestion.ID">
+                {{suggestion.Name}}
+            </span>
+        </div>
+    </div>
+</template>
\ No newline at end of file
diff --git a/web/src/pages/Account.vue b/web/src/pages/Account.vue
index 45a6a2e..c6e706a 100644
--- a/web/src/pages/Account.vue
+++ b/web/src/pages/Account.vue
@@ -1,58 +1,28 @@
 <script lang="ts">
 import { defineComponent } from "vue"
-
-interface Payee {
-    ID : string
-    Name : string
-}
+import Autocomplete from '../components/Autocomplete.vue'
 
 export default defineComponent({
     data() {
         return {
             TransactionDate: new Date().toISOString().substring(0, 10),
-            PayeeID: "",
-            SearchPayees: "",
-            Payees: new Array<Payee>(),
+            Payee: "",
             Category: "",
             Memo: "",
             Amount: 0
         }
     },
+    components: { Autocomplete },
     props: ["budgetid", "accountid"],
     watch: {
-        SearchPayees() {
-            this.GetPayees(this.$data.SearchPayees);
+        Payee() {
+            console.log(this.$data.Payee);
         }
     },
     methods: {
         saveTransaction(e : MouseEvent) {
             e.preventDefault();
         },
-        GetPayees(text : string) {
-            if (text == ""){
-                this.$data.Payees = [];
-                return;
-            }
-
-           fetch("/api/v1/budget/" + this.$store.getters.CurrentBudget.ID + "/autocomplete/payees?s=" + text, {
-               headers: this.$store.getters.AuthHeaders
-           }) .then(x=>x.json())
-           .then(x => {
-               let payees = x || [];
-               if(payees.length > 10){
-                   payees = payees.slice(0, 10);
-               }
-               this.$data.Payees = payees;
-               console.log(x);
-           });
-        },
-        selectPayee(e : MouseEvent) {
-            this.$data.PayeeID = e.target.attributes.value.nodeValue;
-            this.$data.Payees = [];
-        },
-        clearPayee() {
-            this.$data.PayeeID = "";
-        }
     }
 })
 </script>
@@ -71,14 +41,7 @@ export default defineComponent({
                     <input type="date" v-model="TransactionDate" />
                 </td>
                 <td style="max-width: 150px;">
-                    <!--<v-autocomplete v-model="Payee" :loading="PayeesLoading" :search-input.sync="SearchPayees" label="Select payee" />-->
-                    <input v-if="PayeeID == ''" v-model="SearchPayees" />
-                    <span @click="clearPayee" v-if="PayeeID != ''">Selected: {{PayeeID}}</span>
-                    <div v-if="Payees.length > 0" class="absolute bg-gray-400 w-64 p-2">
-                        <span v-for="payee in Payees" class="block" @click="selectPayee" :value="payee.ID">
-                            {{payee.Name}}
-                        </span>
-                    </div>
+                    <Autocomplete v-model="Payee" />
                 </td>
                 <td style="max-width: 200px;">
                     <input type="text" v-model="Category" />