diff --git a/rma_sale/wizard/sale_order_rma_wizard.py b/rma_sale/wizard/sale_order_rma_wizard.py
index e20bc97c..cd0b922b 100644
--- a/rma_sale/wizard/sale_order_rma_wizard.py
+++ b/rma_sale/wizard/sale_order_rma_wizard.py
@@ -53,6 +53,8 @@ class SaleOrderRmaWizard(models.TransientModel):
     def create_and_open_rma(self):
         self.ensure_one()
         rma = self.create_rma()
+        if not rma:
+            return
         for rec in rma:
             rec.action_confirm()
         action = self.env.ref("rma.rma_action").read()[0]
@@ -114,6 +116,7 @@ class SaleOrderLineRmaWizard(models.TransientModel):
     @api.onchange("product_id")
     def onchange_product_id(self):
         self.picking_id = False
+        self.uom_id = self.product_id.uom_id
 
     @api.depends("picking_id")
     def _compute_move_id(self):
diff --git a/website_rma/models/rma.py b/website_rma/models/rma.py
index 8f841880..d55e638e 100644
--- a/website_rma/models/rma.py
+++ b/website_rma/models/rma.py
@@ -12,5 +12,6 @@ class Rma(models.Model):
             team_id=values.get("team_id") or request.website.rma_default_team_id.id,
             user_id=values.get("user_id") or request.website.rma_default_user_id.id,
             partner_id=values.get("partner_id") or request.env.user.partner_id.id,
+            origin="Website form",
         )
         return values