diff --git a/datacenterlight/templates/datacenterlight/order_detail.html b/datacenterlight/templates/datacenterlight/order_detail.html
index 4b8862df..8b1180bb 100644
--- a/datacenterlight/templates/datacenterlight/order_detail.html
+++ b/datacenterlight/templates/datacenterlight/order_detail.html
@@ -35,7 +35,7 @@
                             <address>
                             <h3><b>{% trans "Billed To:"%}</b></h3>
                             {% with request.session.billing_address_data as billing_address %}
-                                {{request.session.user.name}}<br> {{billing_address|get_value_from_dict:'street_address'}}, {{billing_address|get_value_from_dict:'postal_code'}}<br>
+                                {{billing_address|get_value_from_dict:'cardholder_name'}}<br> {{billing_address|get_value_from_dict:'street_address'}}, {{billing_address|get_value_from_dict:'postal_code'}}<br>
                                 {{billing_address|get_value_from_dict:'city'}}, {{billing_address|get_value_from_dict:'country'}}.
                             {% endwith %}
                             </address>
diff --git a/datacenterlight/views.py b/datacenterlight/views.py
index ea7ca3ef..6b0e0d7e 100644
--- a/datacenterlight/views.py
+++ b/datacenterlight/views.py
@@ -343,6 +343,7 @@ class PaymentOrderView(FormView):
         if billing_address_data:
             form_kwargs.update({
                 'initial': {
+                    'cardholder_name': billing_address_data['cardholder_name'],
                     'street_address': billing_address_data['street_address'],
                     'city': billing_address_data['city'],
                     'postal_code': billing_address_data['postal_code'],