diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index c7cef5abedf..c7dde3772a7 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -891,14 +891,21 @@
             </div>
             <div class="col-lg-3 col-lg-offset-1 col-sm-3 text-muted" id="right_column">
                 <h4>Bill To:</h4>
-                <div t-field="website_sale_order.partner_invoice_id"/>
+                <div t-field="website_sale_order.partner_invoice_id" t-field-options='{
+                    "widget": "contact",
+                    "fields": ["address", "name", "phone", "email"]
+                    }'/>
                 <div>
                   <a href="/shop/checkout"><span class="fa fa-arrow-right"/> Change Address</a>
                 </div>
 
                 <h4 class="mt32">Ship To:</h4>
-                <div t-field="website_sale_order.partner_shipping_id"/>
-                <div>
+                <div t-if="website_sale_order.partner_shipping_id.id != website_sale_order.partner_invoice_id.id" t-field="website_sale_order.partner_shipping_id" t-field-options='{
+                    "widget": "contact",
+                    "fields": ["address", "name", "phone"]
+                    }'/>
+                <address t-if="website_sale_order.partner_shipping_id.id == website_sale_order.partner_invoice_id.id">Ship to the same address</address>
+                <div class="mb32">
                   <a href="/shop/checkout"><span class="fa fa-arrow-right"/> Change Address</a>
                 </div>