diff --git a/rma_sale/__manifest__.py b/rma_sale/__manifest__.py
index ab2d7a4a..43cb01d9 100644
--- a/rma_sale/__manifest__.py
+++ b/rma_sale/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management - Link with Sales",
     "summary": "Sale Order - Return Merchandise Authorization (RMA)",
-    "version": "12.0.1.2.0",
+    "version": "12.0.1.3.0",
     "development_status": "Beta",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma_sale/controllers/sale_portal.py b/rma_sale/controllers/sale_portal.py
index 51dd8a7b..f7b32330 100644
--- a/rma_sale/controllers/sale_portal.py
+++ b/rma_sale/controllers/sale_portal.py
@@ -34,6 +34,9 @@ class CustomerPortal(CustomerPortal):
         rma = wizard.sudo().create_rma(from_portal=True)
         for rec in rma:
             rec.origin += _(' (Portal)')
+        # Add the user as follower of the created RMAs so they can
+        # later view them.
+        rma.message_subscribe([request.env.user.partner_id.id])
         if len(rma) == 0:
             route = order_sudo.get_portal_url()
         else:
diff --git a/rma_sale/i18n/es.po b/rma_sale/i18n/es.po
index 57fe29c1..2d491ab1 100644
--- a/rma_sale/i18n/es.po
+++ b/rma_sale/i18n/es.po
@@ -307,6 +307,11 @@ msgstr "Asistente de Orden de Venta - RMA"
 msgid "Sales Order Line"
 msgstr "Línea de pedido de venta"
 
+#. module: rma_sale
+#: model:ir.model,name:rma_sale.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento"
+
 #. module: rma_sale
 #: model:ir.model.fields,field_description:rma_sale.field_sale_order_line_rma_wizard__uom_id
 msgid "Unit of Measure"
@@ -336,6 +341,3 @@ msgstr "Solo puedes crear RMAs desde una orden de venta confirmada o hecha."
 #~| msgid "Delivery"
 #~ msgid "Is Sale Delivery"
 #~ msgstr "Es entrega de orden de venta"
-
-#~ msgid "Stock Move"
-#~ msgstr "Movimiento"
diff --git a/rma_sale/i18n/pt_BR.po b/rma_sale/i18n/pt_BR.po
index 525d0fd1..3ee3696f 100644
--- a/rma_sale/i18n/pt_BR.po
+++ b/rma_sale/i18n/pt_BR.po
@@ -305,6 +305,11 @@ msgstr "Assistente do Pedido de Venda RMA"
 msgid "Sales Order Line"
 msgstr "Linha do Pedido de Venda"
 
+#. module: rma_sale
+#: model:ir.model,name:rma_sale.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
 #. module: rma_sale
 #: model:ir.model.fields,field_description:rma_sale.field_sale_order_line_rma_wizard__uom_id
 msgid "Unit of Measure"
diff --git a/rma_sale/i18n/rma_sale.pot b/rma_sale/i18n/rma_sale.pot
index e2e0a181..609f6afe 100644
--- a/rma_sale/i18n/rma_sale.pot
+++ b/rma_sale/i18n/rma_sale.pot
@@ -287,6 +287,11 @@ msgstr ""
 msgid "Sales Order Line"
 msgstr ""
 
+#. module: rma_sale
+#: model:ir.model,name:rma_sale.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
 #. module: rma_sale
 #: model:ir.model.fields,field_description:rma_sale.field_sale_order_line_rma_wizard__uom_id
 msgid "Unit of Measure"
diff --git a/rma_sale/models/__init__.py b/rma_sale/models/__init__.py
index d8e54bcb..0090dd37 100644
--- a/rma_sale/models/__init__.py
+++ b/rma_sale/models/__init__.py
@@ -2,3 +2,4 @@
 
 from . import rma
 from . import sale
+from . import stock_move
diff --git a/rma_sale/models/sale.py b/rma_sale/models/sale.py
index 25cd223a..a9a9208d 100644
--- a/rma_sale/models/sale.py
+++ b/rma_sale/models/sale.py
@@ -77,7 +77,6 @@ class SaleOrder(models.Model):
     def get_portal_delivery_rma_data(self):
         self.ensure_one()
         data = []
-
         rma_product = self.rma_ids.mapped('product_id')
         for line in self.order_line.filtered(
                 lambda r: r.product_id not in rma_product):
diff --git a/rma_sale/models/stock_move.py b/rma_sale/models/stock_move.py
new file mode 100644
index 00000000..382fcb8e
--- /dev/null
+++ b/rma_sale/models/stock_move.py
@@ -0,0 +1,13 @@
+# Copyright 2020 Tecnativa - Ernesto Tejeda
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import models
+
+
+class StockMove(models.Model):
+    _inherit = "stock.move"
+
+    def _prepare_return_rma_vals(self, original_picking):
+        res = super()._prepare_return_rma_vals(original_picking)
+        res.update(order_id=original_picking.sale_id.id)
+        return res