diff --git a/app/controllers/submission.controller.js b/app/controllers/submission.controller.js
index d91fd97..4fa9efe 100644
--- a/app/controllers/submission.controller.js
+++ b/app/controllers/submission.controller.js
@@ -725,7 +725,7 @@ exports.approveOrRejectSubmission = async (req, res) => {
     const { id } = req.params;
     approve_reject_status  = req.body.approve_reject_status;
     reject_reason  = req.body.reject_reason;
-    approve_or_reject_by  = req.body.approve_or_reject_by;
+    approve_or_reject_by  = req.body.approve_or_reject_by || req.user.id;
 
     if(approve_reject_status == 1)
     {
@@ -740,7 +740,7 @@ exports.approveOrRejectSubmission = async (req, res) => {
       return res.status(404).json({ status: "failed", message: "Submission not found" });
 
     // Update submission main data
-    const result = await submission.update({ approve_reject_status : approve_reject_status , status : statusString, reject_reason, approve_or_reject_by, updated_by: req.user.id, updated_at: new Date() });
+    const result = await submission.update({ approve_reject_status : approve_reject_status , status : statusString, reject_reason, approve_or_reject_by: approve_or_reject_by, updated_by: req.user.id, updated_at: new Date() });
 
 
     //send email to establishment user