diff --git a/app/Ninja/PaymentDrivers/StripePaymentDriver.php b/app/Ninja/PaymentDrivers/StripePaymentDriver.php
index 9464169429c4..60cb07052111 100644
--- a/app/Ninja/PaymentDrivers/StripePaymentDriver.php
+++ b/app/Ninja/PaymentDrivers/StripePaymentDriver.php
@@ -437,6 +437,11 @@ class StripePaymentDriver extends BasePaymentDriver
             } elseif ($isBitcoin) {
                 $payment->payment_type_id = PAYMENT_TYPE_BITCOIN;
             }
+        } else if (! $paymentMethod && $this->isGatewayType(GATEWAY_TYPE_CREDIT_CARD) && ! strcmp($this->purchaseResponse['payment_method_details']['type'], "card")) {
+            $card = $this->purchaseResponse['payment_method_details']['card'];
+            $payment->last4 = $card['last4'];
+            $payment->expiration = $card['exp_year'] . '-' . $card['exp_month'] . '-01';
+            $payment->payment_type_id = PaymentType::parseCardType($card['brand']);
         }
 
         return $payment;
diff --git a/resources/views/payments/credit_card.blade.php b/resources/views/payments/credit_card.blade.php
index f3216543a3a6..4fa61932b72f 100644
--- a/resources/views/payments/credit_card.blade.php
+++ b/resources/views/payments/credit_card.blade.php
@@ -254,7 +254,7 @@
                 <div class="col-md-6">
                     {!! Former::select('country_id')
                             ->placeholder(trans('texts.country_id'))
-                            ->fromQuery($countries, 'name', 'id')
+                            ->fromQuery($countries, 'name', ['value' => 'id', 'data-iso_3166_2' => 'iso_3166_2'])
                             ->addGroupClass('country-select')
                             ->label('') !!}
                 </div>