diff --git a/angelleye-includes/paypal-rest-api-utility.php b/angelleye-includes/paypal-rest-api-utility.php
index ba806f6bc..a69863320 100644
--- a/angelleye-includes/paypal-rest-api-utility.php
+++ b/angelleye-includes/paypal-rest-api-utility.php
@@ -85,6 +85,7 @@ public function create_payment($order, $card_data) {
                 $relatedResources = $transactions[0]->getRelatedResources();
                 $sale = $relatedResources[0]->getSale();
                 $saleId = $sale->getId();
+                do_action('before_save_payment_token', $order->id);
                 $order->add_order_note(__('PayPal Credit Card (REST) payment completed', 'paypal-for-woocommerce'));
                 if(!empty($_POST['wc-paypal_credit_card_rest-payment-token']) && $_POST['wc-paypal_credit_card_rest-payment-token'] == 'new') {
                     if(!empty($_POST['wc-paypal_credit_card_rest-new-payment-method']) && $_POST['wc-paypal_credit_card_rest-new-payment-method'] == true) {
diff --git a/classes/wc-gateway-braintree-angelleye.php b/classes/wc-gateway-braintree-angelleye.php
index 6e5d6407b..91334e949 100644
--- a/classes/wc-gateway-braintree-angelleye.php
+++ b/classes/wc-gateway-braintree-angelleye.php
@@ -579,6 +579,7 @@ public function angelleye_do_payment($order) {
                 $is_sandbox = $this->sandbox == 'no' ? false : true;
                 update_post_meta($order->id, 'is_sandbox', $is_sandbox);
                 $order->payment_complete($this->response->transaction->id);
+                do_action('before_save_payment_token', $order->id);
                 if((!empty($_POST['wc-braintree-payment-token']) && $_POST['wc-braintree-payment-token'] == 'new') || ( $this->enable_braintree_drop_in && $this->supports( 'tokenization' ))) {
                     if((!empty($_POST['wc-braintree-new-payment-method']) && $_POST['wc-braintree-new-payment-method'] == true) || ($this->enable_braintree_drop_in && $this->supports( 'tokenization' ))) {
                         try {
diff --git a/classes/wc-gateway-paypal-advanced-angelleye.php b/classes/wc-gateway-paypal-advanced-angelleye.php
index 7e068a7e8..8f4ccd8b5 100644
--- a/classes/wc-gateway-paypal-advanced-angelleye.php
+++ b/classes/wc-gateway-paypal-advanced-angelleye.php
@@ -209,6 +209,7 @@ private function success_handler($order, $order_id, $silent_post) {
         if ($inq_result == 'Approved') {//if approved
             // Payment complete
             $order->payment_complete($_POST['PNREF']);
+            do_action('before_save_payment_token', $order_id);
             $is_save_payment_method = get_post_meta($order_id, '_is_save_payment_method', true);
             if($is_save_payment_method == 'yes') {
                 $customer_id =  $order->get_user_id();
diff --git a/classes/wc-gateway-paypal-express-angelleye.php b/classes/wc-gateway-paypal-express-angelleye.php
index 39a816b9b..2abaa7a32 100644
--- a/classes/wc-gateway-paypal-express-angelleye.php
+++ b/classes/wc-gateway-paypal-express-angelleye.php
@@ -1399,7 +1399,7 @@ function paypal_express_checkout($posted = null) {
 
                     update_post_meta($order_id, '_express_checkout_token', $this->get_session('TOKEN'));
                     update_post_meta( $order_id, '_first_transaction_id', $result['PAYMENTINFO_0_TRANSACTIONID'] );
-                    
+                    do_action('before_save_payment_token', $order_id);
                     if( isset($result['BILLINGAGREEMENTID']) && !empty($result['BILLINGAGREEMENTID']) ) {
                         update_post_meta( $order_id, 'billing_agreement_id', $result['BILLINGAGREEMENTID'] );
                         if(!empty($_POST['wc-paypal_express-new-payment-method']) && $_POST['wc-paypal_express-new-payment-method'] == true) {
diff --git a/classes/wc-gateway-paypal-pro-angelleye.php b/classes/wc-gateway-paypal-pro-angelleye.php
index 75f1f878e..70bbe433a 100644
--- a/classes/wc-gateway-paypal-pro-angelleye.php
+++ b/classes/wc-gateway-paypal-pro-angelleye.php
@@ -1032,7 +1032,7 @@ function do_payment($order, $card_number, $card_type, $card_exp_month, $card_exp
             
             $is_sandbox = $this->testmode == 'yes' ? true : false;
             update_post_meta($order->id, 'is_sandbox', $is_sandbox);
-     
+            do_action('before_save_payment_token', $order->id);
             if(!empty($_POST['wc-paypal_pro-payment-token']) && $_POST['wc-paypal_pro-payment-token'] == 'new') {
                 if(!empty($_POST['wc-paypal_pro-new-payment-method']) && $_POST['wc-paypal_pro-new-payment-method'] == true) {
                     $customer_id =  $order->get_user_id();
diff --git a/classes/wc-gateway-paypal-pro-payflow-angelleye.php b/classes/wc-gateway-paypal-pro-payflow-angelleye.php
index d7f497271..6a1e94bd0 100644
--- a/classes/wc-gateway-paypal-pro-payflow-angelleye.php
+++ b/classes/wc-gateway-paypal-pro-payflow-angelleye.php
@@ -564,7 +564,7 @@ function do_payment( $order, $card_number, $card_exp, $card_csc, $centinelPAResS
 
                 // Payment complete
                 //$order->add_order_note("PayPal Result".print_r($PayPalResult,true));
-                                
+                do_action('before_save_payment_token', $order->id);               
                 if(!empty($_POST['wc-paypal_pro_payflow-payment-token']) && $_POST['wc-paypal_pro_payflow-payment-token'] == 'new') {
                     if(!empty($_POST['wc-paypal_pro_payflow-new-payment-method']) && $_POST['wc-paypal_pro_payflow-new-payment-method'] == true) {
                         $customer_id =  $order->get_user_id();