diff --git a/src/common-components/dropdown-question/dropdown-question.vue b/src/common-components/dropdown-question/dropdown-question.vue
index e593a61b9..68882467e 100644
--- a/src/common-components/dropdown-question/dropdown-question.vue
+++ b/src/common-components/dropdown-question/dropdown-question.vue
@@ -28,7 +28,9 @@ export default {
     options: {
       type: Object,
       required: true
-    },    
+    },
+    isDisabled: Boolean,
+    isRequired: Boolean,    
   },
   data() {
 
diff --git a/src/common-components/text-question/text-question.vue b/src/common-components/text-question/text-question.vue
deleted file mode 100644
index 12bc58da6..000000000
--- a/src/common-components/text-question/text-question.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-<template>
-    <label :for="inputId">{{ labelText }}</label>
-    <input v-model="value" type="text"
-        :ref="inputId" 
-        :id="inputId"
-        :placeholder="placeholderText" 
-        class="form-control"
-        autocomplete="off" />
-</template>
-
-<script>
-import { useField } from "vee-validate";
-
-export default {
-    name: "textQuestion",
-    props: {
-        modelValue: String,
-        labelText: String,
-        placeholderText: String,
-        inputId: String,
-    },
-    computed: {
-        value: {
-            get: function() {
-                return this.modelValue;
-            },
-            set: function(newValue) {
-                this.$emit("update:modelValue", newValue);
-            }
-        },
-    },
-};
-</script>
diff --git a/src/common-components/textbox-question/textbox-question.vue b/src/common-components/textbox-question/textbox-question.vue
index 9df4c19e7..0bd7d066b 100644
--- a/src/common-components/textbox-question/textbox-question.vue
+++ b/src/common-components/textbox-question/textbox-question.vue
@@ -1,22 +1,41 @@
 <template>
   <div class="textbox-question">
     <label :for="inputId" class="form-label">{{labelText}}</label>
-    <input type="text" class="form-control" :id="inputId" :placeholder="placeholderText" :aria-disabled="isDisabled" :disabled="isDisabled" :aria-required="isRequired">
+    <input v-model="value" 
+      type="text" 
+      class="form-control" 
+      :ref="inputId" 
+      :id="inputId" 
+      :placeholder="placeholderText" 
+      :aria-disabled="isDisabled" 
+      :disabled="isDisabled" 
+      :aria-required="isRequired"
+      autocomplete="off" />
     <p class="mt-1 mb-0">There has been an error!</p>
   </div>
 </template>
 
 <script>
 export default {
-  name: "textboxQuestion",
+  name: "textbox-question",
   props: {
-    isDisabled: Boolean,
     modelValue: String,
     labelText: String,
     placeholderText: String,
     inputId: String,
+    isDisabled: Boolean,
     isRequired: Boolean,
-  }
+  },
+  computed: {
+      value: {
+          get: function() {
+              return this.modelValue;
+          },
+          set: function(newValue) {
+              this.$emit("update:modelValue", newValue);
+          }
+      },
+  },
 };
 </script>
 
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index dc37d2168..b08887c02 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -2,14 +2,14 @@
     <form>
         <div class="row my-4">
             <div class="col">
-                <textQuestion v-model="address.streetAddress" ref="autocomplete" inputId="autocomplete" placeholderText="Search" labelText="Street address" />
+                <textboxQuestion v-model="streetAddress" ref="autocomplete" inputId="autocomplete" placeholderText="Search" labelText="Street address" />
             </div>
         </div>
     </form>
     <form>
         <div v-show="showAddressFields" class="row my-4">
             <div class="col">
-                <textQuestion v-model="city" ref="city" inputId="city" labelText="City" />
+                <textboxQuestion v-model="city" ref="city" inputId="city" labelText="City" />
             </div>
         </div>
     </form> 
@@ -19,7 +19,7 @@
                 <dropdownQuestion v-model="state" ref="state" inputId="state" :options="stateOptions" labelText="State"  />
             </div>            
             <div class="col-6">
-                <textQuestion v-model="zip" ref="zip" inputId="zip" labelText="Zip" />
+                <textboxQuestion v-model="zip" ref="zip" inputId="zip" labelText="Zip" />
             </div>      
         </div> 
     </form>
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import textQuestion from "@/common-components/text-question/text-question";
+import textboxQuestion from "@/common-components/textbox-question/textbox-question";
 import dropdownQuestion from "@/common-components/dropdown-question/dropdown-question";
 import alert from "@/ux-components/alert/alert";
 //import store from "@/store";
@@ -50,9 +50,6 @@ export default ({
             showAddressFields: false,
             displayVerificationWarning: false,
             displayNoMatchWarning: false,
-            address: {
-                streetAddress: "",
-            },
             streetAddress: "",
             city: "",
             state: "",
@@ -230,7 +227,7 @@ export default ({
             });
     },
     components: {
-        textQuestion,
+        textboxQuestion,
         dropdownQuestion,
         alert,
     }
diff --git a/src/layouts/address-lookup/customer-questions/customer-questions.vue b/src/layouts/address-lookup/customer-questions/customer-questions.vue
index 9be41ed55..ee63ce763 100644
--- a/src/layouts/address-lookup/customer-questions/customer-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/customer-questions.vue
@@ -1,23 +1,25 @@
 <template>
-    <addressQuestions v-model="address" />
+    <addressQuestions />
     <div class="row my-4">
       <div class="col">
-          <textQuestion v-model="firstName" ref="firstName" inputId="firstName" labelText="First name" />
+        <textboxQuestion v-model="firstName" ref="firstName" inputId="firstName" labelText="First name" />
       </div>
     </div> 
     <div class="row my-4">
       <div class="col">
-          <textQuestion v-model="lastName" ref="lastName" inputId="lastName" labelText="Last name" />
+        <textboxQuestion v-model="lastName" ref="lastName" inputId="lastName" labelText="Last name" />
       </div>
     </div>
-    <emailQuestion />  
-
+    <div class="row my-4">
+      <div class="col">
+        <textboxQuestion v-model="emailAddress" ref="emailAddress" inputId="emailAddress" labelText="Email address" />
+      </div>
+    </div>  
 </template>
 
 <script>
 import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
-import emailQuestion from "@/layouts/address-lookup/customer-questions/email-question/email-question";
-import textQuestion from "@/common-components/text-question/text-question";
+import textboxQuestion from "@/common-components/textbox-question/textbox-question";
 
 //import store from "@/store";
 
@@ -25,11 +27,9 @@ export default ({
     name: "customer-questions",
     data(){
         return {
-            address: {
-                streetAddress: "",
-            },
             firstName: "",
             lastName: "",
+            emailAddress: "",
         }
     },
     methods: {
@@ -49,8 +49,7 @@ export default ({
     },
     components: {
         addressQuestions,
-        emailQuestion,
-        textQuestion,
+        textboxQuestion,
     }
 })
 </script>
\ No newline at end of file
diff --git a/src/layouts/address-lookup/customer-questions/email-question/email-question.vue b/src/layouts/address-lookup/customer-questions/email-question/email-question.vue
deleted file mode 100644
index 0e6db4f3a..000000000
--- a/src/layouts/address-lookup/customer-questions/email-question/email-question.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-<template>
-    <div class="row my-4">
-      <div class="col">
-        <textQuestion v-model="email" ref="email" inputId="email" labelText="Email address" />
-      </div>
-    </div>   
-</template>
-
-<script>
-import textQuestion from "@/common-components/text-question/text-question";
-import store from "@/store";
-
-export default ({
-    name: "emailQuestion",
-    data(){
-        return {
-            email: "",
-        }
-    },
-    components: {
-        textQuestion,
-    },
-})
-</script>
\ No newline at end of file