diff --git a/modules/ppcp-button/resources/js/modules/Renderer/CardFieldsFreeTrialRenderer.js b/modules/ppcp-button/resources/js/modules/Renderer/CardFieldsFreeTrialRenderer.js
index c813e7fc7..d2700aadb 100644
--- a/modules/ppcp-button/resources/js/modules/Renderer/CardFieldsFreeTrialRenderer.js
+++ b/modules/ppcp-button/resources/js/modules/Renderer/CardFieldsFreeTrialRenderer.js
@@ -48,9 +48,14 @@ class CardFieldsFreeTrialRenderer {
 			errorHandler
 		);
 
-		const cardFields = paypal.CardFields(
-			configuration.cardFieldsConfiguration()
+		let cardFields = paypal.CardFields(
+			configuration.addPaymentMethodConfiguration()
 		);
+		if ( this.defaultConfig.user.is_logged ) {
+			cardFields = paypal.CardFields(
+				configuration.cardFieldsConfiguration()
+			);
+		}
 
 		if ( cardFields.isEligible() ) {
 			const renderCardFields = new RenderCardFields( cardFields );
diff --git a/modules/ppcp-save-payment-methods/resources/js/Configuration.js b/modules/ppcp-save-payment-methods/resources/js/Configuration.js
index e779dbdbc..42ad02a77 100644
--- a/modules/ppcp-save-payment-methods/resources/js/Configuration.js
+++ b/modules/ppcp-save-payment-methods/resources/js/Configuration.js
@@ -194,6 +194,65 @@ class Configuration {
 			},
 		};
 	}
+
+	addPaymentMethodConfiguration() {
+		return {
+			createVaultSetupToken: async () => {
+				const response = await fetch(
+					this.ppcp_add_payment_method.ajax.create_setup_token
+						.endpoint,
+					{
+						method: 'POST',
+						credentials: 'same-origin',
+						headers: {
+							'Content-Type': 'application/json',
+						},
+						body: JSON.stringify( {
+							nonce: this.ppcp_add_payment_method.ajax
+								.create_setup_token.nonce,
+							payment_method: getCurrentPaymentMethod(),
+						} ),
+					}
+				);
+
+				const result = await response.json();
+				if ( result.data.id ) {
+					return result.data.id;
+				}
+
+				console.error( result );
+			},
+			onApprove: async ( { vaultSetupToken } ) => {
+				const response = await fetch(
+					this.ppcp_add_payment_method.ajax
+						.create_payment_token_for_guest.endpoint,
+					{
+						method: 'POST',
+						credentials: 'same-origin',
+						headers: {
+							'Content-Type': 'application/json',
+						},
+						body: JSON.stringify( {
+							nonce: this.ppcp_add_payment_method.ajax
+								.create_payment_token_for_guest.nonce,
+							vault_setup_token: vaultSetupToken,
+						} ),
+					}
+				);
+
+				const result = await response.json();
+				if ( result.success === true ) {
+					document.querySelector( '#place_order' ).click();
+					return;
+				}
+
+				console.error( result );
+			},
+			onError: ( error ) => {
+				console.error( error );
+			},
+		};
+	}
 }
 
 export default Configuration;
diff --git a/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php b/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
index 319510b68..393328660 100644
--- a/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
+++ b/modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
@@ -434,6 +434,22 @@ class CreditCardGateway extends \WC_Payment_Gateway_CC {
 			);
 		}
 
+		$guest_card_payment_for_free_trial = WC()->session->get( 'ppcp_guest_payment_for_free_trial' ) ?? null;
+		WC()->session->get( 'ppcp_guest_payment_for_free_trial', null );
+		if($guest_card_payment_for_free_trial) {
+			$customer_id = $guest_card_payment_for_free_trial->customer->id ?? '';
+			if ( $customer_id ) {
+				update_user_meta( $wc_order->get_customer_id(), '_ppcp_target_customer_id', $customer_id );
+			}
+
+			if ( isset( $guest_card_payment_for_free_trial->payment_source->card ) ) {
+				$this->wc_payment_tokens->create_payment_token_card( $wc_order->get_customer_id(), $guest_card_payment_for_free_trial );
+
+				$wc_order->payment_complete();
+				return $this->handle_payment_success( $wc_order );
+			}
+		}
+
 		$card_payment_token_for_free_trial = WC()->session->get( 'ppcp_card_payment_token_for_free_trial') ?? null;
 		WC()->session->set( 'ppcp_card_payment_token_for_free_trial', null );
 		if($card_payment_token_for_free_trial) {