diff --git a/src/Components/Login/Login.js b/src/Components/Login/Login.js
index 9a290e0..7a061e1 100644
--- a/src/Components/Login/Login.js
+++ b/src/Components/Login/Login.js
@@ -26,10 +26,10 @@ const Login = () => {
         email,
         password
       );
-
       // Signed in
       userCredential?.user && navigate("/dashboard");
     } catch (error) {
+      console.log("error", error);
       if (
         ["auth/invalid-login-credentials", "auth/invalid-email"].includes(
           error.code
diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js
index 9c80144..f1d7f62 100644
--- a/src/Components/SignupPage/SignupPage.js
+++ b/src/Components/SignupPage/SignupPage.js
@@ -241,7 +241,6 @@ const SignupPage = () => {
 
   // ******************** STRIPE PAY API CALL ******************** //
   async function handleStripeAuthorization(
-    user,
     paymentDataValues,
     customerDataValues
   ) {
@@ -326,16 +325,7 @@ const SignupPage = () => {
     setIsBusy(true);
     if (paymentDataValues && dataValues) {
       try {
-        const userCredential = await createUserWithEmailAndPassword(
-          auth,
-          dataValues.email,
-          dataValues.password
-        );
-
-        const user = userCredential.user;
-
         const paymentResponse = await handleStripeAuthorization(
-          user,
           paymentDataValues,
           dataValues
         );
@@ -343,14 +333,30 @@ const SignupPage = () => {
           "----------------------------->>>>>>>>>>>>>>>>>paymentResponse",
           paymentResponse
         );
+        const customerId = data.customerId;
+        const subscriptionId = data.subscriptionId;
+
         if (paymentResponse === false) {
           setIsBusy(false);
           setNotice("Sorry, something went wrong. Please try again.");
           return;
         } else {
+          const userCredential = await createUserWithEmailAndPassword(
+            auth,
+            dataValues.email,
+            dataValues.password
+          );
+
+          const user = userCredential.user;
           dataValues = { ...dataValues, ...paymentResponse };
+          if (subscriptionId) {
+            dataValues.subscriptionId = subscriptionId;
+          }
+          if (customerId) {
+            dataValues.customerId = customerId;
+          }
           await saveUserData(user.uid, dataValues);
-          navigate("/");
+          navigate("/dashboard");
         }
       } catch (error) {
         setIsBusy(false);