diff --git a/src/layouts/address-poc/address-poc.vue b/src/layouts/address-poc/address-poc.vue
index cc7950b9a..5f092d043 100644
--- a/src/layouts/address-poc/address-poc.vue
+++ b/src/layouts/address-poc/address-poc.vue
@@ -5,46 +5,51 @@
         <vehicleBanner ref="vehicleBanner"  :displayGenericVehicleImage=true />
       </div>
     </div>
-    <div class="row my-4">
-      <div class="col">
-        <label for="autocomplete">Street address</label>
-        <input ref="autocomplete" 
-            id="autocomplete"
-            placeholder="Search" 
-            class="form-control search-location"
-            type="text" 
-            autocomplete="off" />
+    <form>
+      <div class="row my-4">
+        <div class="col">
+          <label for="autocomplete">Street address</label>
+          <input ref="autocomplete" 
+              id="autocomplete"
+              placeholder="Search" 
+              class="form-control search-location"
+              type="text" 
+              autocomplete="off" />
+        </div>
       </div>
-    </div>
-    <div v-show="showAddressFields" class="row my-4">
-      <div class="col">
-        <label for="city">City</label>
-        <input ref="city" 
-            id="city"
-            class="form-control"
-            type="text" 
-            autocomplete="off" />
+    </form>
+    <form>
+      <div v-show="showAddressFields" class="row my-4">
+        <div class="col">
+          <label for="city">City</label>
+          <input ref="city" 
+              id="city"
+              class="form-control"
+              type="text" 
+              autocomplete="off" />
+        </div>
       </div>
-    </div> 
-    <div v-show="showAddressFields" class="row my-4">
-      <div class="col-6">
-        <label for="state">State</label>
-        <input ref="state" 
-            id="state"
-            class="form-control"
-            type="text" 
-            autocomplete="off" />
-      </div>
-      <div class="col-6">
-        <label for="zip">Zip</label>
-        <input ref="zip" 
-            id="zip"
-            class="form-control"
-            type="text" 
-            autocomplete="off" />
-      </div>      
-    </div> 
-
+    </form> 
+    <form>
+      <div v-show="showAddressFields" class="row my-4">
+        <div class="col-6">
+          <label for="state">State</label>
+          <input ref="state" 
+              id="state"
+              class="form-control"
+              type="text" 
+              autocomplete="off" />
+        </div>
+        <div class="col-6">
+          <label for="zip">Zip</label>
+          <input ref="zip" 
+              id="zip"
+              class="form-control"
+              type="text" 
+              autocomplete="off" />
+        </div>      
+      </div> 
+    </form>
     <div v-show="displayVerificationWarning" class="row my-4">
       <div class="col">
         <span style="color: red;">An accurate match may not have have been located. Please verify your address before continuing</span>
@@ -112,8 +117,8 @@ export default {
     let addressField1 = document.getElementById("autocomplete");
     let self = this;
 
-    //let apiKey = "AIzaSyDptGCkOPgN2uWJOy4ou4M33phRD4MAoJo"; // localhost:8080
-    let apiKey = "AIzaSyBji_2ApAj2vE_XNGyV-LaUEKrmuElpJ1w"; // Dev and above
+    let apiKey = "AIzaSyDptGCkOPgN2uWJOy4ou4M33phRD4MAoJo"; // localhost:8080
+    //let apiKey = "AIzaSyBji_2ApAj2vE_XNGyV-LaUEKrmuElpJ1w"; // Dev and above
 
     this.$loadScript(`https://maps.googleapis.com/maps/api/js?key=${apiKey}&libraries=places`)
       .then(() => {