diff --git a/src/database/models/SalesOrder.js b/src/database/models/SalesOrder.js
index 77d6896e..f6e61885 100644
--- a/src/database/models/SalesOrder.js
+++ b/src/database/models/SalesOrder.js
@@ -128,7 +128,7 @@ export const SalesOrder = {
         return objectData?.state?.type != 'draft'
       },
       objectData: (objectData) => ({
-        order: { _id: objectData._id },
+        order: objectData,
         orderType: 'salesOrder',
         syncAmount: 'itemPrice'
       })
@@ -142,10 +142,12 @@ export const SalesOrder = {
       disabled: (objectData) => {
         return objectData?.state?.type != 'draft'
       },
-      objectData: (objectData) => ({
-        orderType: 'salesOrder',
-        order: { _id: objectData._id }
-      })
+      objectData: (objectData) => {
+        return {
+          orderType: 'salesOrder',
+          order: objectData
+        }
+      }
     },
     {
       name: 'newInvoice',
diff --git a/src/database/models/User.js b/src/database/models/User.js
index 37b7ce66..95ec1c71 100644
--- a/src/database/models/User.js
+++ b/src/database/models/User.js
@@ -74,7 +74,7 @@ export const User = {
       disabled: (objectData) => {
         return objectData?._user?._id != objectData?._id
       },
-      objectData: (objectData) => ({ user: objectData })
+      objectData: (objectData) => ({ user: objectData?._user || objectData })
     }
   ],
   pages: [