diff --git a/v1/src/lib/Handlers/Proposals.handler.js b/v1/src/lib/Handlers/Proposals.handler.js
index 04a3f1f..e4b03b3 100644
--- a/v1/src/lib/Handlers/Proposals.handler.js
+++ b/v1/src/lib/Handlers/Proposals.handler.js
@@ -41,7 +41,6 @@ async function onPostEvent( id , newProposalData ){
 async function onPatchEvent( id , newProposalData ){
     const proposal = await proposalsModel.findById( id );
     if( !newProposalData.is_accepted ){
-        const load = await loadsModel.findById( proposal.load );
         /// Update Proposal:
         /// Remove shipper
         await proposalsModel.findByIdAndUpdate( id , {
@@ -54,19 +53,13 @@ async function onPatchEvent( id , newProposalData ){
             carrier : null,
             driver : null,
             vehicle : null,
+            bidder : null
         } );
-
-        const notification = new notificationsModel({
-            "owner": user.id,
-            "title": `Your proposal has been accepted!`,
-            "description": `${load.shipment_code}`,
-            "tag":"accepted_proposal",
-            "deleted":false
-        });
     }else{
         const shipper_user = await usersModel.findById( proposal.accepted_by );
         const shipper = await companiesModel.findById( shipper_user.company );
         const vehicle  = await vehiclesModel.findById( proposal.vehicle );
+        const load = await loadsModel.findById( proposal.load );
         /// Update Proposal:
         /// Adding shipper to proposal
         await proposalsModel.findByIdAndUpdate( id , {
@@ -79,7 +72,16 @@ async function onPatchEvent( id , newProposalData ){
             carrier : proposal.carrier,
             driver : vehicle.driver,
             vehicle : proposal.vehicle,
+            bidder : proposal.bidder
         } );
+
+        const notification = new notificationsModel({
+            "owner": user.id,
+            "title": `Your proposal has been accepted!`,
+            "description": `${load.shipment_code}`,
+            "tag":"accepted_proposal",
+            "deleted":false
+        });
     }
 }