diff --git a/app/Services/PaymentService.php b/app/Services/PaymentService.php
index d3ce97a7f935..21417437bfd1 100644
--- a/app/Services/PaymentService.php
+++ b/app/Services/PaymentService.php
@@ -558,14 +558,8 @@ class PaymentService extends BaseService
         
         if (!empty($paymentDetails['card'])) {
             $card = $paymentDetails['card'];
-            $payment->last4 = substr($card->number, -4);
-            $year = $card->expiryYear;
-            if (strlen($year) == 2) {
-                $year = '20' . $year;
-            }
-
-            $payment->expiration = $year . '-' . $card->expiryMonth . '-00';
-            $payment->payment_type_id = $this->detectCardType($card->number);
+            $payment->last4 = $card->getNumberLastFour();
+            $payment->payment_type_id = $this->detectCardType($card->getNumber());
         }
 
         if ($accountGateway->gateway_id == GATEWAY_STRIPE) {
@@ -863,7 +857,7 @@ class PaymentService extends BaseService
                 function ($model) {
                     $max_refund = number_format($model->amount - $model->refunded, 2);
                     $formatted = Utils::formatMoney($max_refund, $model->currency_id, $model->country_id);
-                    $symbol = Utils::getFromCache($model->currency_id, 'currencies')->symbol;
+                    $symbol = Utils::getFromCache($model->currency_id ? $model->currency_id : 1, 'currencies')->symbol ;
                     return "javascript:showRefundModal({$model->public_id}, '{$max_refund}', '{$formatted}', '{$symbol}')";
                 },
                 function ($model) {
diff --git a/resources/views/payments/add_paymentmethod.blade.php b/resources/views/payments/add_paymentmethod.blade.php
index c0e5ef5f1868..7c5ca2b956cf 100644
--- a/resources/views/payments/add_paymentmethod.blade.php
+++ b/resources/views/payments/add_paymentmethod.blade.php
@@ -488,6 +488,7 @@
                         <input type="hidden" name="payment_method_nonce" value="{{$sourceId}}">
                         <input type="hidden" name="first_name" value="{{$paypalDetails->firstName}}">
                         <input type="hidden" name="last_name" value="{{$paypalDetails->lastName}}">
+                        <input type="hidden" name="email" value="{{$paypalDetails->email}}">
                         <p>&nbsp;</p>
                         @if (isset($amount) && $client && $account->showTokenCheckbox())
                             <input id="token_billing" type="checkbox" name="token_billing" {{ $account->selectTokenCheckbox() ? 'CHECKED' : '' }} value="1" style="margin-left:0px; vertical-align:top">
diff --git a/resources/views/payments/paymentmethods_list.blade.php b/resources/views/payments/paymentmethods_list.blade.php
index 78b2653236ba..8745cadcce49 100644
--- a/resources/views/payments/paymentmethods_list.blade.php
+++ b/resources/views/payments/paymentmethods_list.blade.php
@@ -82,6 +82,7 @@
 @endforeach
 @endif
 
+@if($gateway->gateway_id != GATEWAY_STRIPE || $gateway->getPublishableStripeKey())
 <center>
     {!! Button::success(strtoupper(trans('texts.add_credit_card')))
     ->asLinkTo(URL::to('/client/paymentmethods/add/'.($gateway->getPaymentType() == PAYMENT_TYPE_STRIPE ? 'stripe_credit_card' : 'credit_card'))) !!}
@@ -98,6 +99,7 @@
         <div id="paypal-container"></div>
     @endif
 </center>
+@endif
 
 <div class="modal fade" id="completeVerificationModal" tabindex="-1" role="dialog" aria-labelledby="completeVerificationModalLabel" aria-hidden="true">
     <div class="modal-dialog" style="min-width:150px">