diff --git a/modules/ppcp-vaulting/src/PaymentTokenChecker.php b/modules/ppcp-vaulting/src/PaymentTokenChecker.php
index b6df7496a..c9035fda2 100644
--- a/modules/ppcp-vaulting/src/PaymentTokenChecker.php
+++ b/modules/ppcp-vaulting/src/PaymentTokenChecker.php
@@ -148,7 +148,7 @@ class PaymentTokenChecker {
 							$subscription->set_requires_manual_renewal( true );
 							$subscription->save();
 
-							$message = __( 'Subscription set to Manual Renewal because the payment method could not be saved at PayPal', 'woocommerce-paypal-payments' );
+							$message = __( 'Subscription set to Manual Renewal because payment method was not saved at PayPal.', 'woocommerce-paypal-payments' );
 							$wc_order->add_order_note( $message );
 
 						} catch ( Exception $exception ) {
@@ -197,7 +197,7 @@ class PaymentTokenChecker {
 	 * @param WC_Order $wc_order The WC order.
 	 */
 	private function update_failed_status( WC_Order $wc_order ): void {
-		$error_message = __( 'Subscription payment failed because the payment method could not be saved at PayPal. Contact PayPal MTS for guidance.', 'woocommerce-paypal-payments' );
+		$error_message = __( 'Subscription payment failed. Payment method was not saved at PayPal.', 'woocommerce-paypal-payments' );
 		$wc_order->update_status( 'failed', $error_message );
 
 		/**
diff --git a/modules/ppcp-vaulting/src/VaultingModule.php b/modules/ppcp-vaulting/src/VaultingModule.php
index aa772ff2b..669e0b9ff 100644
--- a/modules/ppcp-vaulting/src/VaultingModule.php
+++ b/modules/ppcp-vaulting/src/VaultingModule.php
@@ -197,7 +197,7 @@ class VaultingModule implements ModuleInterface {
 					}
 
 					if ( $subscription_behavior_when_vault_fails === 'capture_auth' ) {
-						echo wp_kses_post( '<p>' . __( 'Subscription set to Manual Renewal because the payment method could not be saved. To enable automatic renewal payments, please try a different payment method.', 'woocommerce-paypal-payments' ) . '</p>' );
+						echo wp_kses_post( '<p>' . __( 'The subscription has been activated but the payment method could not be saved. Please try again with a different payment method to allow automatic renewal payments.', 'woocommerce-paypal-payments' ) . '</p>' );
 					}
 				}
 			}
diff --git a/modules/ppcp-wc-gateway/src/Gateway/ProcessPaymentTrait.php b/modules/ppcp-wc-gateway/src/Gateway/ProcessPaymentTrait.php
index 1b57294d7..da17f822b 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/ProcessPaymentTrait.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/ProcessPaymentTrait.php
@@ -53,15 +53,16 @@ trait ProcessPaymentTrait {
 	 * @param int $customer_id The customer ID.
 	 */
 	protected function schedule_saved_payment_check( int $wc_order_id, int $customer_id ): void {
+		$timestamp = 1 * MINUTE_IN_SECONDS;
 		if (
 			$this->config->has( 'subscription_behavior_when_vault_fails' )
 			&& $this->config->get( 'subscription_behavior_when_vault_fails' ) === 'capture_auth'
 		) {
-			return;
+			$timestamp = 0;
 		}
 
 		as_schedule_single_action(
-			time() + ( 1 * MINUTE_IN_SECONDS ),
+			time() + $timestamp,
 			'woocommerce_paypal_payments_check_saved_payment',
 			array(
 				'order_id'    => $wc_order_id,