diff --git a/modules.local/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php b/modules.local/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
index 991fac1d0..576f02700 100644
--- a/modules.local/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
+++ b/modules.local/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
@@ -117,13 +117,41 @@ class CreditCardGateway extends PayPalGateway
         }
 
         $titleOptions = [
-            'visa' => _x('Visa', 'Name of credit card', 'woocommerce-paypal-commerce-gateway'),
-            'mastercard' => _x('Mastercard', 'Name of credit card', 'woocommerce-paypal-commerce-gateway'),
-            'amex' => _x('American Express', 'Name of credit card', 'woocommerce-paypal-commerce-gateway'),
-            'discover' => _x('Discover', 'Name of credit card', 'woocommerce-paypal-commerce-gateway'),
-            'jcb' => _x('JCB', 'Name of credit card', 'woocommerce-paypal-commerce-gateway'),
-            'elo' => _x('Elo', 'Name of credit card', 'woocommerce-paypal-commerce-gateway'),
-            'hiper' => _x('Hiper', 'Name of credit card', 'woocommerce-paypal-commerce-gateway'),
+            'visa' => _x(
+                'Visa',
+                'Name of credit card',
+                'woocommerce-paypal-commerce-gateway'
+            ),
+            'mastercard' => _x(
+                'Mastercard',
+                'Name of credit card',
+                'woocommerce-paypal-commerce-gateway'
+            ),
+            'amex' => _x(
+                'American Express',
+                'Name of credit card',
+                'woocommerce-paypal-commerce-gateway'
+            ),
+            'discover' => _x(
+                'Discover',
+                'Name of credit card',
+                'woocommerce-paypal-commerce-gateway'
+            ),
+            'jcb' => _x(
+                'JCB',
+                'Name of credit card',
+                'woocommerce-paypal-commerce-gateway'
+            ),
+            'elo' => _x(
+                'Elo',
+                'Name of credit card',
+                'woocommerce-paypal-commerce-gateway'
+            ),
+            'hiper' => _x(
+                'Hiper',
+                'Name of credit card',
+                'woocommerce-paypal-commerce-gateway'
+            ),
         ];
         $images = array_map(
             function (string $type) use ($titleOptions): string {
diff --git a/modules.local/ppcp-wc-gateway/src/Settings/SettingsListener.php b/modules.local/ppcp-wc-gateway/src/Settings/SettingsListener.php
index 86f77dd81..c09b82e4f 100644
--- a/modules.local/ppcp-wc-gateway/src/Settings/SettingsListener.php
+++ b/modules.local/ppcp-wc-gateway/src/Settings/SettingsListener.php
@@ -69,8 +69,9 @@ class SettingsListener
                 && absint($_POST['woocommerce_ppcp-gateway_enabled']) === 1;
         }
         if ($_GET['section'] === CreditCardGateway::ID) {
-            $settings['dcc_gateway_enabled'] = isset($_POST['woocommerce_ppcp-credit-card-gateway_enabled'])
-                && absint($_POST['woocommerce_ppcp-credit-card-gateway_enabled']) === 1;
+            $dccEnabledPostKey = 'woocommerce_ppcp-credit-card-gateway_enabled';
+            $settings['dcc_gateway_enabled'] = isset($_POST[$dccEnabledPostKey])
+                && absint($_POST[$dccEnabledPostKey]) === 1;
         }
         $this->maybeRegisterWebhooks($settings);