diff --git a/src/hooks/AuthHooks.res b/src/hooks/AuthHooks.res
index 61ec1c785..57792db24 100644
--- a/src/hooks/AuthHooks.res
+++ b/src/hooks/AuthHooks.res
@@ -23,6 +23,8 @@ let getHeaders = (~uri, ~headers, ()) => {
     let res = switch hyperSwitchToken {
     | Some(token) => {
         headers->Dict.set("authorization", `Bearer ${token}`)
+        headers->Dict.set("api-key", `hyperswitch`)
+        headers->Dict.set("Content-Type", `application/json`)
         headers
       }
 
diff --git a/src/screens/HyperSwitch/Home/CommonConnectorFlow/ConfigureConnector.res b/src/screens/HyperSwitch/Home/CommonConnectorFlow/ConfigureConnector.res
index f83651a1b..bdc0fe990 100644
--- a/src/screens/HyperSwitch/Home/CommonConnectorFlow/ConfigureConnector.res
+++ b/src/screens/HyperSwitch/Home/CommonConnectorFlow/ConfigureConnector.res
@@ -48,6 +48,24 @@ let make = (~connectProcessorValue: connectProcessor) => {
     }
   }
 
+  React.useEffect1(() => {
+    if choiceState === #NotSelected {
+      setButtonState(_ => Button.Disabled)
+    } else {
+      setButtonState(_ => Button.Normal)
+    }
+    None
+  }, [choiceState])
+
+  React.useEffect1(() => {
+    if smartRoutingChoiceState === #NotSelected {
+      setButtonState(_ => Button.Disabled)
+    } else {
+      setButtonState(_ => Button.Normal)
+    }
+    None
+  }, [smartRoutingChoiceState])
+
   React.useEffect2(() => {
     setInitialValues(prevJson => {
       let prevJsonDict = prevJson->LogicUtils.getDictFromJsonObject
@@ -185,6 +203,8 @@ let make = (~connectProcessorValue: connectProcessor) => {
           listChoices={connectorChoiceArray}
           nextButton={<Button
             buttonType=Primary
+            showBtnTextToolTip={buttonState === Button.Disabled}
+            tooltipText="Please select one of the choices"
             text="Proceed"
             onClick={_ => {
               mixpanelEvent(~eventName=`quickstart_landing`, ())
@@ -249,6 +269,8 @@ let make = (~connectProcessorValue: connectProcessor) => {
             listChoices={getSmartRoutingConfigurationText}
             nextButton={<Button
               buttonType=Primary
+              showBtnTextToolTip={buttonState === Button.Disabled}
+              tooltipText="Please select one of the choices"
               text="Proceed"
               onClick={_ => {
                 mixpanelEvent(~eventName=`quickstart_configure_smart_routing`, ())
diff --git a/src/screens/HyperSwitch/Home/CommonConnectorFlow/QuickStartConnectorFlow.res b/src/screens/HyperSwitch/Home/CommonConnectorFlow/QuickStartConnectorFlow.res
index 9a56b0e19..8247c71c0 100644
--- a/src/screens/HyperSwitch/Home/CommonConnectorFlow/QuickStartConnectorFlow.res
+++ b/src/screens/HyperSwitch/Home/CommonConnectorFlow/QuickStartConnectorFlow.res
@@ -115,6 +115,15 @@ let make = (
     }
   }
 
+  React.useEffect1(() => {
+    if choiceStateForTestConnector === #NotSelected {
+      setButtonState(_ => Button.Disabled)
+    } else {
+      setButtonState(_ => Button.Normal)
+    }
+    None
+  }, [choiceStateForTestConnector])
+
   React.useEffect1(() => {
     let defaultJsonOnNewConnector =
       [("profile_id", activeBusinessProfile.profile_id->Js.Json.string)]
@@ -144,6 +153,8 @@ let make = (
           buttonType=Primary
           text="Proceed"
           buttonState
+          showBtnTextToolTip={buttonState === Button.Disabled}
+          tooltipText="Please select one of the choices"
           onClick={_ => {
             handleConnectorSubmit()
           }}
diff --git a/src/screens/HyperSwitch/Home/CommonConnectorFlow/SetupConnector.res b/src/screens/HyperSwitch/Home/CommonConnectorFlow/SetupConnector.res
index 72b00334e..fb3ba99f8 100644
--- a/src/screens/HyperSwitch/Home/CommonConnectorFlow/SetupConnector.res
+++ b/src/screens/HyperSwitch/Home/CommonConnectorFlow/SetupConnector.res
@@ -22,6 +22,14 @@ module SelectProcessor = {
         | UnknownConnector(_) => Button.Disabled
         | _ => Button.Normal
         }}
+        showBtnTextToolTip={switch selectedConnector {
+        | UnknownConnector(_) => true
+        | _ => false
+        }}
+        tooltipText={switch selectedConnector {
+        | UnknownConnector(_) => "Please select one of the processor"
+        | _ => ""
+        }}
         text="Proceed"
         onClick={_ => {
           setConnectorConfigureState(_ => Select_configuration_type)
diff --git a/src/screens/HyperSwitch/Home/QuickStart/IntegrateYourApp/IntegrateYourAppLanding.res b/src/screens/HyperSwitch/Home/QuickStart/IntegrateYourApp/IntegrateYourAppLanding.res
index 085dec4f6..072b47c42 100644
--- a/src/screens/HyperSwitch/Home/QuickStart/IntegrateYourApp/IntegrateYourAppLanding.res
+++ b/src/screens/HyperSwitch/Home/QuickStart/IntegrateYourApp/IntegrateYourAppLanding.res
@@ -64,6 +64,15 @@ let make = (~integrateAppValue: integrateApp) => {
     setQuickStartPageState(_ => GoLive(LANDING))
   }
 
+  React.useEffect1(() => {
+    if choiceState === #NotSelected {
+      setButtonState(_ => Button.Disabled)
+    } else {
+      setButtonState(_ => Button.Normal)
+    }
+    None
+  }, [choiceState])
+
   <>
     {switch integrateAppValue {
     | LANDING =>
@@ -94,6 +103,8 @@ let make = (~integrateAppValue: integrateApp) => {
               buttonType=Primary
               text="Proceed"
               buttonState
+              showBtnTextToolTip={buttonState === Button.Disabled}
+              tooltipText="Please select one of the choices"
               onClick={_ => {
                 mixpanelEvent(~eventName=`quickstart_integration_landing_option`, ())
                 handleIntegration()->ignore