diff --git a/payment/uc_paypal/uc_paypal.module b/payment/uc_paypal/uc_paypal.module
index d7a53b9..2f17a88 100644
--- a/payment/uc_paypal/uc_paypal.module
+++ b/payment/uc_paypal/uc_paypal.module
@@ -687,7 +687,7 @@ function uc_paypal_ec_checkout($form, &$form_state) {
     'CANCELURL' => url('uc_paypal/wps/cancel', array('absolute' => TRUE)),
     'AMT' => uc_price($order->order_total, $context, $options),
     'CURRENCYCODE' => variable_get('uc_paypal_wpp_currency', 'USD'),
-    'PAYMENTACTION' => variable_get('uc_paypal_wpp_payment_action', 'Sale'),
+    'PAYMENTACTION' => variable_get('uc_pg_paypal_wpp_cc_txn_type', UC_CREDIT_AUTH_CAPTURE) == UC_CREDIT_AUTH_ONLY ? 'Authorization' : 'Sale',
     'DESC' => substr($desc, 0, 127),
     'INVNUM' => $order->order_id .'-'. time(),
     'REQCONFIRMSHIPPING' => variable_get('uc_paypal_ec_rqconfirmed_addr', 0),
@@ -786,7 +786,7 @@ function uc_paypal_ec_form_submit($form, &$form_state) {
     'CANCELURL' => url('uc_paypal/wps/cancel', array('absolute' => TRUE)),
     'AMT' => uc_price($subtotal, $context, $options),
     'CURRENCYCODE' => variable_get('uc_paypal_wpp_currency', 'USD'),
-    'PAYMENTACTION' => variable_get('uc_paypal_wpp_payment_action', 'Sale'),
+    'PAYMENTACTION' => variable_get('uc_pg_paypal_wpp_cc_txn_type', UC_CREDIT_AUTH_CAPTURE) == UC_CREDIT_AUTH_ONLY ? 'Authorization' : 'Sale',
     'DESC' => substr($desc, 0, 127),
     'INVNUM' => $order->order_id .'-'. time(),
     'REQCONFIRMSHIPPING' => variable_get('uc_paypal_ec_rqconfirmed_addr', 0),
@@ -855,7 +855,7 @@ function uc_paypal_ec_submit_form_submit($form, &$form_state) {
   $nvp_request = array(
     'METHOD' => 'DoExpressCheckoutPayment',
     'TOKEN' => $_SESSION['TOKEN'],
-    'PAYMENTACTION' => variable_get('uc_paypal_wpp_payment_action', 'Sale'),
+    'PAYMENTACTION' => variable_get('uc_pg_paypal_wpp_cc_txn_type', UC_CREDIT_AUTH_CAPTURE) == UC_CREDIT_AUTH_ONLY ? 'Authorization' : 'Sale',
     'PAYERID' => $_SESSION['PAYERID'],
     'AMT' => uc_price($order->order_total, $context, $options),
     'DESC' => substr($desc, 0, 127),