diff --git a/website_return_management/controllers/__init__.py b/website_return_management/controllers/__init__.py
index 4f00ce5cc..318db6a83 100644
--- a/website_return_management/controllers/__init__.py
+++ b/website_return_management/controllers/__init__.py
@@ -20,6 +20,5 @@
 #    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 ###################################################################################
-
 from . import main
 from . import portal
diff --git a/website_return_management/controllers/main.py b/website_return_management/controllers/main.py
index 7ef51b402..f2d4a82a6 100644
--- a/website_return_management/controllers/main.py
+++ b/website_return_management/controllers/main.py
@@ -47,11 +47,11 @@ class CustomerRegistration(main.Home):
             'create_date': datetime.now(),
         }
         stock_picks = request.env['stock.picking'].search([('origin', '=', order.name)])
-        moves = stock_picks.mapped('move_ids_without_package').filtered(lambda p: p.product_id == product_id)
+        moves = stock_picks.mapped('move_ids_without_package').with_user(1).filtered(lambda p: p.product_id == product_id)
         if moves:
             moves = moves.sorted('product_uom_qty', reverse=True)
             values.update({'state': 'draft'})
-            ret_order = request.env['sale.return'].create(values)
+            ret_order = request.env['sale.return'].with_user(1).create(values)
             moves[0].picking_id.return_order = ret_order.id
             moves[0].picking_id.return_order_picking = False
         return request.redirect('/my/request-thank-you')
diff --git a/website_return_management/views/sale_order.xml b/website_return_management/views/sale_order.xml
index 5d3202319..1dfe14d17 100644
--- a/website_return_management/views/sale_order.xml
+++ b/website_return_management/views/sale_order.xml
@@ -104,11 +104,8 @@
                             </t>
                         </span>
                     </div>
-
                 </div>
-
             </form>
-
         </xpath>
     </template>