diff --git a/Areas/Inventory/Views/InventoryMaster/QrMaster.cshtml b/Areas/Inventory/Views/InventoryMaster/QrMaster.cshtml
index 81d1b37..71f66c1 100644
--- a/Areas/Inventory/Views/InventoryMaster/QrMaster.cshtml
+++ b/Areas/Inventory/Views/InventoryMaster/QrMaster.cshtml
@@ -1125,8 +1125,8 @@
                     const formData = {
 
                         ...(this.selectedAction === 'user' ? { 
-                            lastStore: null, 
-                            lastUser: this.currentUser.id, 
+                            lastStore: this.currentUser.store,
+                            lastUser: this.currentUser.id,
                             toOther: 'On Delivery', 
                             SendDate: this.assigndate, 
                             toUser: this.selectedUser, 
@@ -1146,8 +1146,8 @@
                             ConsignmentNote: this.document} : {}),
 
                         ...(this.selectedAction === 'store' ? { 
-                            lastStore: this.currentUser.store, 
-                            lastUser: null, 
+                            lastStore: this.currentUser.store,
+                            lastUser: this.currentUser.id,
                             toOther: 'On Delivery', 
                             SendDate: this.assigndate, 
                             toStore: this.selectedStore, 
@@ -1248,12 +1248,12 @@
                         receiveToStation = this.thisItem.toStation;
                     }
                     else if (this.thisItem.toStore) {
-                        receiveToUser = null;
+                        receiveToUser = this.currentUser.id;
                         receiveToStore = this.currentUser.store;
                     }
                     else if (this.thisItem.toUser) {
                         receiveToUser = this.currentUser.id;
-                        receiveToStore = null;
+                        receiveToStore = this.currentUser.store;
                     }
 
                     const formData = {