diff --git a/datacenterlight/templates/datacenterlight/order_detail.html b/datacenterlight/templates/datacenterlight/order_detail.html
index cb412558..c2c15894 100644
--- a/datacenterlight/templates/datacenterlight/order_detail.html
+++ b/datacenterlight/templates/datacenterlight/order_detail.html
@@ -1,7 +1,8 @@
 {% extends "hosting/base_short.html" %}
 {% load staticfiles bootstrap3 %}
 {% load i18n %}
-{% block content %} 
+{% load custom_tags %}
+{% block content %}
 
 <div class="order-detail-container">
    {% if messages %}
@@ -27,15 +28,16 @@
     			<div class="col-xs-6">
     				<address>
                     <h3><b>{% trans "Billed To:"%}</b></h3>
-    					{{user.name}}<br>
-                        {{order.billing_address.street_address}},{{order.billing_address.postal_code}}<br>
-                        {{order.billing_address.city}}, {{order.billing_address.country}}.
+                    {% 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:'city'}}, {{billing_address|get_value_from_dict:'country'}}.
+                    {% endwith %}
     				</address>
     			</div>
                 <div class="col-xs-6 text-right">
                     <address>
                         <strong>{% trans "Date"%}:</strong><br>
-                        {{order.created_at}}<br><br>
+                        {% now "jS F Y" %}<br><br>
                     </address>
 
                 </div>
@@ -45,7 +47,7 @@
     				<address>
     					<strong>{% trans "Payment Method:"%}</strong><br>
     					{{order.cc_brand}} ending **** {{order.last4}}<br>
-    					{{user.email}}
+    					{{request.session.user.email}}
     				</address>
     			</div>
     		</div>