diff --git a/ns_app/api/payments.py b/ns_app/api/payments.py
index 9865c82..b61a6b8 100644
--- a/ns_app/api/payments.py
+++ b/ns_app/api/payments.py
@@ -120,6 +120,9 @@ def call_payment_api(payload):
 @frappe.whitelist()
 def run_token_payment(invoice, token, cardholder_name=None, billing_zip=None, save_autopay=0):
 
+    if not frappe.conf.get("enable_autopay_signup"):
+        save_autopay = 0
+
     inv = frappe.get_doc("Sales Invoice", invoice)
     customer = frappe.get_doc("Customer", inv.customer)
 
diff --git a/ns_app/public/js/sales_invoice.js b/ns_app/public/js/sales_invoice.js
index 7d29c2e..3ddb486 100644
--- a/ns_app/public/js/sales_invoice.js
+++ b/ns_app/public/js/sales_invoice.js
@@ -142,9 +142,9 @@ function open_manual_payment_form(frm) {
                         </div>
 
                         <div class="mt-3">
-                            <label>
+                            <label style="color: red; font-weight: bold;">
                                 <input type="checkbox" id="save_autopay_${uid}" />
-                                Save for Auto Pay
+                                Save for Auto Pay (** Not Fuctional Yet **)
                             </label>
                         </div>
 
@@ -270,7 +270,9 @@ function open_manual_payment_form(frm) {
                         const finalZip = enteredZip || frm.doc.billing_zip || frm.doc.pincode;
                         
                         // Check autopay enrollment choice
-                        const save_autopay = document.getElementById(`save_autopay_${uid}`)?.checked;
+                        const AUTOPAY_ENABLED = false;
+                        const checkbox = document.getElementById(`save_autopay_${uid}`);
+                        const save_autopay = AUTOPAY_ENABLED ? checkbox?.checked : 0;
 
 
                         run_token_payment(frm, response.token, dialog, {