diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index b992b498c..b6f9bba06 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -129,7 +129,7 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                     "res_id": self.res_id,
                     "node_id": self.node_btn_id.node_id.id,
                     "workflow_id": self.node_btn_id.workflow_id.id,
-                    "done_by": self.env.user.id,
+                    "done_by": self.employee_ids[0].users_id.id,
                     "node_btn_name": "0",
                     "node_btn_id": self.node_btn_id.id,
                     "lase_click_date": fields.Datetime.now(),