diff --git a/website_rma/controllers/main.py b/website_rma/controllers/main.py
index bf365282..54e51a02 100644
--- a/website_rma/controllers/main.py
+++ b/website_rma/controllers/main.py
@@ -9,11 +9,11 @@ from odoo.http import request
 class WebsiteForm(WebsiteForm):
 
     def insert_record(self, request, model, values, custom, meta=None):
-        if model.model == 'rma':
-            values['partner_id'] = request.env.user.partner_id.id
-            values['origin'] = 'Website form'
-        res = super(WebsiteForm, self).insert_record(
-            request, model, values, custom, meta)
+        if model.model != 'rma':
+            return super().insert_record(request, model, values, custom, meta)
+        values['partner_id'] = request.env.user.partner_id.id
+        values['origin'] = 'Website form'
+        res = super().insert_record(request, model, values, custom, meta)
         # Add the customer to the followers, the same as when creating
         # an RMA from a sales order in the portal.
         rma = request.env['rma'].browse(res).sudo()