diff --git a/src/fmg-components/address-questions/address-questions.vue b/src/fmg-components/address-questions/address-questions.vue
index 3e57e83c3..ebe9967fe 100644
--- a/src/fmg-components/address-questions/address-questions.vue
+++ b/src/fmg-components/address-questions/address-questions.vue
@@ -287,6 +287,7 @@ export default {
             // });
 
             this.addressField1.addEventListener("input", (e) => {
+                console.log(`input event`);
                 console.log(e);
 
                 switch (e.inputType) {
@@ -298,7 +299,7 @@ export default {
                         break;
                     default:
                         // If the user enters text by *autofill* then disable the *autocomplete*
-                        this.showAddressFields = true;
+                        //this.showAddressFields = true;
                         //this.addressField1.dispatchEvent(new Event("change"))
                         this.unloadAutocomplete();
                 }
@@ -447,23 +448,24 @@ export default {
         }
 
         // Temporary
-        // const element = document.getElementsByClassName("address-questions")[0];
-        // element.addEventListener("change", (e) => {
-        //     console.log(e)
-        //     if (this.showAddressFields) {
-        //         return false;
-        //     }
+        const element = document.getElementsByClassName("address-questions")[0];
+        element.addEventListener("change", (e) => {
+            console.log(`change event`);
+            console.log(e);
+            if (this.showAddressFields) {
+                return false;
+            }
 
-        //     let autoFilledInputs = [];
-        //     autoFilledInputs = element.querySelectorAll("input:-webkit-autofill");
+            let autoFilledInputs = [];
+            autoFilledInputs = element.querySelectorAll("input:-webkit-autofill");
 
-        //     this.showAddressFields = autoFilledInputs.length > 0;
-        //     if (this.showAddressFields) {
-        //         this.unloadAutocomplete();
-        //     }
+            this.showAddressFields = autoFilledInputs.length > 0;
+            if (this.showAddressFields) {
+                this.unloadAutocomplete();
+            }
 
-        //     this.addressField1.classList.remove("has-icon");
-        // });
+            this.addressField1.classList.remove("has-icon");
+        });
     },
     beforeUpdate() {
         // It is necessary to set focus on the street address on this lifecycle hook when this component is used in a modal.