diff --git a/application/controllers/information.php b/application/controllers/information.php
index 7ec3c042..74134625 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -709,7 +709,6 @@ class Information extends CI_Controller
             $info_page_form_content = $this->load->view($template_path . '-info-page-form', false, true);
             $information->ic_content = str_replace('<!--@INFO-PAGE-FORM@-->', $info_page_form_content, $information->ic_content);
         } else {
-            $template = str_replace('<!--@PRODUCT-JS@-->', '<script src="https://data.chinahighlights.com/js/flatpickr.js"></script>', $template);
             $inquiry_form_template = $this->load->view($template_path . '-inquiry-form', array('meta_product_code' => $meta_product_code), true);
             $information->ic_content = str_replace('<!--@INQUIRY-FORM@-->', $inquiry_form_template, $information->ic_content);
 
@@ -1273,8 +1272,7 @@ class Information extends CI_Controller
         if (empty($meta_product_code)) {
             $addthis_widget = $this->load->view($template_path . '-add-this', false, true);
             $template = str_replace('<!--@ADDTHIS-WIDGET@-->', $addthis_widget, $template);
-        } else {
-            $template = str_replace('<!--@PRODUCT-JS@-->', '<script src="https://data.asiahighlights.com/js/flatpickr.js"></script>', $template);            
+        } else {          
             $inquiry_form_template = $this->load->view(
                 $template_path . '-inquiry-form', 
                 array('meta_product_code' => $meta_product_code, 'information' => $information), 
diff --git a/application/views/mobile_first/ch-info-page-form.php b/application/views/mobile_first/ch-info-page-form.php
index 024c543e..71e9c0ad 100644
--- a/application/views/mobile_first/ch-info-page-form.php
+++ b/application/views/mobile_first/ch-info-page-form.php
@@ -1,7 +1,7 @@
 <div class="tmbottom">
     <p style="padding: 15px 15px 30px 15px;">Start planning your tailor-made tour now. Your 1:1 travel consultant will reply within 1 working day.</p>
     <form action="https://www.chinahighlights.com/secureforms/qi_save" id="quick_inquiry_form" method="post"
-          name="quick_inquiry_form" novalidate="" onsubmit="return validateQuickInquiryForm()">
+          name="quick_inquiry_form" novalidate="">
         <div class="InquiryBox">
             <textarea id="form_additionalrequirements" name="form_additionalrequirements"
             placeholder="Tell us your travel requirements here: anniversary, honeymoon, family trip, birthday travel, beach, food... (optional)"></textarea>
@@ -586,35 +586,13 @@
                       <div class="checkYes"><label for="WhatsApp"><input class="checkBorder" id="WhatsApp" name="WhatsApp" type="checkbox" value="contact via WhatsApp">WhatsApp </label></div>
                       <div class="checkYes"><label for="Phone"><input class="checkBorder" id="Phone" name="Phone" type="checkbox" value="contact via Phone">Phone call</label></div>
             <input type="hidden" name="nullemail">
-            <input name="cli_no" type="hidden" value="YDFW"><button class="sendButton" id="quick_inquiry_button" name="quick_inquiry_button" type="submit">Send My Inquiry</button>
+            <input name="cli_no" type="hidden" value="YDFW"><button class="sendButton" id="quick_inquiry_button" name="quick_inquiry_button" type="button">Send My Inquiry</button>
         </div>
     </form>
     </div>
-<script src="https://www.recaptcha.net/recaptcha/api.js?render=6Lf4bfAaAAAAAEZZ9rX0ZIYfPAqACtRldSOFzl9b"></script>
-<script>
-var formEle = document.getElementById('info_page_form');
-grecaptcha.ready(function () {
-    grecaptcha.execute('6Lf4bfAaAAAAAEZZ9rX0ZIYfPAqACtRldSOFzl9b', {action: 'info_page_form'}).then(function (token) {
-        var el = document.createElement("input");
-        el.type = "hidden";
-        el.name = "__recaptcha_token__";
-        el.value = token;
-        formEle.appendChild(el);
-    });
-});
-</script>
+<script src="https://www.recaptcha.net/recaptcha/enterprise.js?render=6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja"></script>
 <script src="https://data.chinahighlights.com/js/flatpickr-4.6.1.min.js"></script>
 <script>
-document.addEventListener('DOMContentLoaded', () => {
-    flatpickr("#starting_date", {
-        dateFormat: "Y-m-d",
-        altInput: true,
-        altFormat: "F j, Y",
-        disableMobile: true,
-        minDate: "today"
-    });
-});
-
 function validateQuickInquiryForm() {
     var result = true;
     var realnameVal = document.getElementById("realname").value;
@@ -651,5 +629,37 @@ function validateQuickInquiryForm() {
     }
     return result;
 }
+document.addEventListener('DOMContentLoaded', () => {
+  flatpickr("#starting_date", {
+    dateFormat: "Y-m-d",
+    altInput: true,
+    altFormat: "F j, Y",
+    disableMobile: true,
+    minDate: "today"
+  });
+  
+
+  var quick_inquiry_form = document.getElementById('quick_inquiry_form');
+  var quick_inquiry_button = document.getElementById('quick_inquiry_button');
+  
+  quick_inquiry_button.addEventListener('click', function(evt) {
+    if (validateQuickInquiryForm()) {
+      if (typeof(grecaptcha) === "undefined") {
+        console.warn('grecaptcha is disabled.');
+        quick_inquiry_form.submit();
+      } else {
+        grecaptcha.enterprise.ready(async () => {
+          const token = await grecaptcha.enterprise.execute('6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja', {action: 'ADD_TO_CART'});
+          var el = document.createElement("input");
+          el.type = "hidden";
+          el.name = "__grecaptcha_token__";
+          el.value = token;
+          quick_inquiry_form.appendChild(el);
+          quick_inquiry_form.submit();
+        });
+      }
+    }
+  });
+});
 </script>
     
\ No newline at end of file
diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php
index de535c7c..962689cc 100644
--- a/application/views/mobile_first/ch-inquiry-form.php
+++ b/application/views/mobile_first/ch-inquiry-form.php
@@ -1,11 +1,7 @@
 <div class="tmbottom">
-
-  
-
     <p style="padding: 15px 15px 30px 15px;">Start planning your tailor-made tour now. Your 1:1 travel consultant will reply within 1 working day.</p>
-
     <form action="https://www.chinahighlights.com/secureforms/qi_save" id="quick_inquiry_form" method="post"
-          name="quick_inquiry_form" novalidate="" onsubmit="return validateQuickInquiryForm()">
+          name="quick_inquiry_form" novalidate="">
         <div class="InquiryBox">
             <textarea id="form_additionalrequirements" name="form_additionalrequirements"
             placeholder="Tell us your travel requirements here: anniversary, honeymoon, family trip, birthday travel, beach, food... (optional)"></textarea>
@@ -591,7 +587,7 @@
                       <div class="checkYes"><label for="Phone"><input class="checkBorder" id="Phone" name="Phone" type="checkbox" value="contact via Phone">Phone call</label></div>
             <input type="hidden" name="nullemail">
             <input name="cli_no" type="hidden" value="<?php echo $meta_product_code; ?>"/>
-            <button class="sendButton" id="quick_inquiry_button" name="quick_inquiry_button" type="submit">Send My
+            <button class="sendButton" id="quick_inquiry_button" name="quick_inquiry_button" type="button">Send My
                 Inquiry</button>
         </div>
     </form>
@@ -603,5 +599,76 @@
              <div class="wechatinfo">Quickly inquire about this tour via our WeChat: <span class="wechatred">chinahighlightstour</span>
              </div>
          </div>
+</div>
+<script src="https://www.recaptcha.net/recaptcha/enterprise.js?render=6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja"></script>
+<script src="https://data.chinahighlights.com/js/flatpickr-4.6.1.min.js"></script>
+<script>
+function validateQuickInquiryForm() {
+    var result = true;
+    var realnameVal = document.getElementById("realname").value;
+    var emailVal = document.getElementById("email").value;
+    var startingDateVal = document.getElementById("starting_date").value;
+
+    var startingDateErrEl = document.getElementById("starting_date_errmsg");
+    var realnameErrEl = document.getElementById("realname_errmsg");
+    var emailErrEl = document.getElementById("email_errmsg");
+    var emailVerifyErrEl = document.getElementById("email_verify_errmsg");
+
+    if (realnameErrEl) realnameErrEl.style.display = 'none';
+    if (emailErrEl) emailErrEl.style.display = 'none';
+    if (emailVerifyErrEl) emailVerifyErrEl.style.display = 'none';
+    if (startingDateErrEl) startingDateErrEl.style.display = 'none';
+
+    if (realnameVal === '') {
+        realnameErrEl.style.display = '';
+        result = false;
+    }
+    if (emailVal === '') {
+        emailErrEl.style.display = '';
+        result = false;
+    } else {
+        var emailPattern = /^[\w\-\.]+@[\w\-\.]+(\.\w+)+$/;
+        if (!emailPattern.test(emailVal) && emailVerifyErrEl) {
+            emailVerifyErrEl.style.display = '';
+            result = false;
+        }
+    }
+    if (startingDateVal === '') {
+        startingDateErrEl.style.display = '';
+        result = false;
+    }
+    return result;
+}
+document.addEventListener('DOMContentLoaded', () => {
+  flatpickr("#starting_date", {
+    dateFormat: "Y-m-d",
+    altInput: true,
+    altFormat: "F j, Y",
+    disableMobile: true,
+    minDate: "today"
+  });
+
+  var quick_inquiry_form = document.getElementById('quick_inquiry_form');
+  var quick_inquiry_button = document.getElementById('quick_inquiry_button');
+  
+  quick_inquiry_button.addEventListener('click', function(evt) {
+    if (validateQuickInquiryForm()) {
+      if (typeof(grecaptcha) === "undefined") {
+        console.warn('grecaptcha is disabled.');
+        quick_inquiry_form.submit();
+      } else {
+        grecaptcha.enterprise.ready(async () => {
+          const token = await grecaptcha.enterprise.execute('6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja', {action: 'ADD_TO_CART'});
+          var el = document.createElement("input");
+          el.type = "hidden";
+          el.name = "__grecaptcha_token__";
+          el.value = token;
+          quick_inquiry_form.appendChild(el);
+          quick_inquiry_form.submit();
+        });
+      }
+    }
+  });
+});
 
-</div>
\ No newline at end of file
+</script>
\ No newline at end of file