diff --git a/modules/ppcp-onboarding/assets/css/onboarding.css b/modules/ppcp-onboarding/assets/css/onboarding.css
index 878a8715d..b2d06a26b 100644
--- a/modules/ppcp-onboarding/assets/css/onboarding.css
+++ b/modules/ppcp-onboarding/assets/css/onboarding.css
@@ -4,7 +4,8 @@
 
 #field-client_secret,
 #field-client_id,
-#field-merchant_id {
+#field-merchant_id,
+#field-merchant_email{
 	display: none;
 }
 
diff --git a/modules/ppcp-onboarding/assets/js/settings.js b/modules/ppcp-onboarding/assets/js/settings.js
index e2ad199e0..3bd7bd494 100644
--- a/modules/ppcp-onboarding/assets/js/settings.js
+++ b/modules/ppcp-onboarding/assets/js/settings.js
@@ -65,6 +65,7 @@ const groupToggleSelect = (selector, group) => {
         (event) => {
             event.preventDefault();
             document.querySelector('#field-toggle_manual_input').style.display = 'none';
+            document.querySelector('#field-merchant_email').style.display = 'table-row';
             document.querySelector('#field-merchant_id').style.display = 'table-row';
             document.querySelector('#field-client_id').style.display = 'table-row';
             document.querySelector('#field-client_secret').style.display = 'table-row';
diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php
index d86ccdccc..c81267ca9 100644
--- a/modules/ppcp-wc-gateway/services.php
+++ b/modules/ppcp-wc-gateway/services.php
@@ -197,13 +197,10 @@ return array(
 				'requirements' => array(),
 				'gateway'      => 'paypal',
 			),
-			'merchant_email'             => array(
-				'title'        => __( 'Email address', 'paypal-payments-for-woocommerce' ),
-				'type'         => 'text',
-				'required'     => true,
-				'desc_tip'     => true,
-				'description'  => __( 'The email address of your PayPal account.', 'paypal-payments-for-woocommerce' ),
-				'default'      => '',
+			'toggle_manual_input'        => array(
+				'type'         => 'ppcp-text',
+				'title'        => __( 'Manual mode', 'paypal-payments-for-woocommerce' ),
+				'text'         => '<button id="ppcp[toggle_manual_input]">' . __( 'Toggle to manual credential input', 'paypal-payments-for-woocommerce' ) . '</button>',
 				'screens'      => array(
 					State::STATE_START,
 					State::STATE_PROGRESSIVE,
@@ -212,10 +209,13 @@ return array(
 				'requirements' => array(),
 				'gateway'      => 'paypal',
 			),
-			'toggle_manual_input'        => array(
-				'type'         => 'ppcp-text',
-				'title'        => __( 'Manual mode', 'paypal-payments-for-woocommerce' ),
-				'text'         => '<button id="ppcp[toggle_manual_input]">' . __( 'Toggle to manual credential input', 'paypal-payments-for-woocommerce' ) . '</button>',
+			'merchant_email'             => array(
+				'title'        => __( 'Email address', 'paypal-payments-for-woocommerce' ),
+				'type'         => 'text',
+				'required'     => true,
+				'desc_tip'     => true,
+				'description'  => __( 'The email address of your PayPal account.', 'paypal-payments-for-woocommerce' ),
+				'default'      => '',
 				'screens'      => array(
 					State::STATE_START,
 					State::STATE_PROGRESSIVE,