diff --git a/src/Components/Modals/PaymentModal.js b/src/Components/Modals/PaymentModal.js
index 40620c1..1c4944f 100644
--- a/src/Components/Modals/PaymentModal.js
+++ b/src/Components/Modals/PaymentModal.js
@@ -53,10 +53,6 @@ const PaymentModal = ({
 
   const totalToday = amountToday + extraAccountsPrice;
 
-  function handleValidateAndPay() {
-    handleSignup(totalToday);
-  }
-
   return (
     <Modal show="true" size="lg">
       <Modal.Header className="payment-modal-header" closeButton>
@@ -151,7 +147,7 @@ const PaymentModal = ({
         <Button
           disabled={isBusy}
           className="primary-button"
-          onClick={handleValidateAndPay}
+          onClick={handleSignup}
           labelText="Signup"
         />
       </Modal.Footer>
diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js
index 38d49bc..a37d057 100644
--- a/src/Components/SignupPage/SignupPage.js
+++ b/src/Components/SignupPage/SignupPage.js
@@ -189,8 +189,8 @@ const SignupPage = () => {
       barNumber,
       practiceArea,
       email,
-      subscriptionId,
-      customerId,
+      //subscriptionId,
+      //customerId,
     };
 
     try {
@@ -217,14 +217,14 @@ const SignupPage = () => {
     if (isBusy) {
       return;
     }
-    /*
+
     const dataValues = validateUserData();
     if (dataValues === null) {
       return;
     }
 
     saveLeadData(dataValues);
-    */
+
     setShowSelectPlan(!showSelectPlan);
   };
 
@@ -309,10 +309,10 @@ const SignupPage = () => {
   }
   // ******************** END STRIPE PAY API CALL ******************** //
 
-  const handleSignup = async () => {
-    if (isBusy) {
-      return;
-    }
+  const handleSignup = async (e) => {
+    e.preventDefault();
+    console.log("handleSignup");
+
     const paymentDataValues = validatePaymentData();
     if (paymentDataValues === null) {
       return;
@@ -323,10 +323,9 @@ const SignupPage = () => {
       return;
     }
 
-    const planType = determinePlan(isAnnual, activeRadioOption);
-
+    //const planType = determinePlan(isAnnual, activeRadioOption);
+    setIsBusy(true);
     if (paymentDataValues && dataValues) {
-      setIsBusy(true);
       try {
         const userCredential = await createUserWithEmailAndPassword(
           auth,
@@ -342,7 +341,7 @@ const SignupPage = () => {
           dataValues
         );
         console.log(
-          "----------------------------->>>>paymentResponse",
+          "----------------------------->>>>>>>>>>>>>>>>>paymentResponse",
           paymentResponse
         );
         if (paymentResponse === false) {