diff --git a/rma/views/report_rma.xml b/rma/views/report_rma.xml
index 2225bab3..35110d2a 100644
--- a/rma/views/report_rma.xml
+++ b/rma/views/report_rma.xml
@@ -17,6 +17,13 @@
                     t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
                 </t>
             </t>
+            <t t-if="(doc.partner_id or doc.partner_shipping_id) and doc.partner_id != doc.partner_shipping_id">
+                <t t-set="information_block">
+                    <strong>Shipping address:</strong>
+                    <div t-field="doc.partner_shipping_id"
+                    t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
+                </t>
+            </t>
             <div class="page">
                 <h2 class="mt16">
                     <span t-if="doc.state not in ['draft', 'cancelled']">RMA # </span>
diff --git a/rma_sale/views/sale_portal_template.xml b/rma_sale/views/sale_portal_template.xml
index 3d999a16..b0851be9 100644
--- a/rma_sale/views/sale_portal_template.xml
+++ b/rma_sale/views/sale_portal_template.xml
@@ -32,18 +32,17 @@
                             </div>
                             <t
                                 t-set="delivery_addresses"
-                                t-value="sale_order.partner_id.commercial_partner_id.mapped('child_ids').filtered(lambda x: x.type in ['contact', 'delivery'])"
+                                t-value="sale_order.partner_shipping_id | sale_order.partner_id.commercial_partner_id.mapped('child_ids').filtered(lambda x: x.type in ['contact', 'delivery'])"
                             />
                             <button
                                 class="btn btn-primary btn-block mb8"
                                 type="button" data-toggle="collapse"
                                 data-target="#delivery_address_picker"
                                 aria-expanded="false"
-
                             ><i class="fa fa-truck" /> Choose a delivery address</button>
                             <div class="col-lg-12 collapse mt8" id="delivery_address_picker">
                                 <div data-toggle="buttons" class="row">
-                                    <label t-attf-class="card mr4 btn btn-light" t-foreach="delivery_addresses" t-as="address">
+                                    <label t-attf-class="card mr4 btn btn-light #{address == sale_order.partner_shipping_id and 'active' or ''}" t-foreach="delivery_addresses" t-as="address">
                                             <input class="d-none" type="radio" name="partner_shipping_id" t-att-value="address.id">
                                                 <strong>
                                                     <i t-attf-class="text-secondary fa #{address.type == 'delivery' and 'fa-truck' or 'fa-user'}" />