diff --git a/app/Models/Payment.php b/app/Models/Payment.php
index b0001569dcc8..9171c9d22c69 100644
--- a/app/Models/Payment.php
+++ b/app/Models/Payment.php
@@ -174,6 +174,11 @@ class Payment extends EntityModel
         }
         return PaymentMethod::lookupBankData($this->routing_number);
     }
+
+    public function getLast4Attribute($value)
+    {
+        return $value ? str_pad($value, 4, '0', STR_PAD_LEFT) : null;
+    }
 }
 
 Payment::creating(function ($payment) {
diff --git a/resources/views/payments/paymentmethods_list.blade.php b/resources/views/payments/paymentmethods_list.blade.php
index 1522f2ac0a94..78b2653236ba 100644
--- a/resources/views/payments/paymentmethods_list.blade.php
+++ b/resources/views/payments/paymentmethods_list.blade.php
@@ -67,9 +67,9 @@
         @elseif($paymentMethod->status == PAYMENT_METHOD_STATUS_VERIFICATION_FAILED)
         ({{trans('texts.verification_failed')}})
         @endif
-    @elseif($paymentMethod->type_id == PAYMENT_TYPE_ID_PAYPAL)
+    @elseif($paymentMethod->payment_type_id == PAYMENT_TYPE_ID_PAYPAL)
         {{ $paymentMethod->email }}
-    @else
+    @elseif($paymentMethod->expiration)
         {!! trans('texts.card_expiration', array('expires'=>Utils::fromSqlDate($paymentMethod->expiration, false)->format('m/y'))) !!}
     @endif
     @if($paymentMethod->id == $paymentMethod->account_gateway_token->default_payment_method_id)