diff --git a/datacenterlight/views.py b/datacenterlight/views.py
index 3ea3cdc8..616dde30 100644
--- a/datacenterlight/views.py
+++ b/datacenterlight/views.py
@@ -222,19 +222,15 @@ class PaymentOrderView(FormView):
                 billing_address_form = BillingAddressForm(
                     instance=self.request.user.billing_addresses.first()
                 )
-            # Get user last order
-            last_hosting_order = HostingOrder.objects.filter(
-                customer__user=self.request.user
-            ).last()
-
-            # If user has already an hosting order, get the credit card
-            # data from it
-            if last_hosting_order:
-                credit_card_data = last_hosting_order.get_cc_data()
-                if credit_card_data:
-                    context['credit_card_data'] = credit_card_data
-                else:
-                    context['credit_card_data'] = None
+            user = self.request.user
+            if hasattr(user, 'stripecustomer'):
+                stripe_customer = user.stripecustomer
+            else:
+                stripe_customer = None
+            cards_list = UserCardDetail.get_all_cards_list(
+                stripe_customer=stripe_customer
+            )
+            context.update({'cards_list': cards_list})
         else:
             billing_address_form = BillingAddressFormSignup(
                 initial=billing_address_data