diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py
index 3f1e43788..feaa3cbae 100644
--- a/soong_workflow/models/soong_workflow_mixin.py
+++ b/soong_workflow/models/soong_workflow_mixin.py
@@ -133,7 +133,7 @@ class SoongWorkflowMixin(models.AbstractModel):
             button_ids = record.sudo().workflow_id.node_ids.button_ids.search([('workflow_id', '=', res.workflow_id.id), ('sequence', '=', 1)])
             for button_id in button_ids:
                 if record.env.user.employee_id.department_id:
-                    if not button_id.is_automatic:
+                    if not button_id.node_id.department_id:
                         if button_id.users_role_id:
                             employee_ids = record.sudo().env['hr.employee'].search(
                                 ['|', ('user_role_id', '=', button_id.users_role_id.id),
@@ -148,12 +148,12 @@ class SoongWorkflowMixin(models.AbstractModel):
                         if button_id.users_role_id:
                             employee_ids = record.sudo().env['hr.employee'].search(
                                 ['|', ('user_role_id', '=', button_id.users_role_id.id), ('user_role_ids', 'in', button_id.users_role_id.id),
-                                 '|', ('department_id', '=', record.env.user.employee_id.department_id.id), ('department_ids', 'in', record.env.user.employee_id.department_id.id),
+                                 '|', ('department_id', '=', button_id.node_id.department_id.id), ('department_ids', 'in', button_id.node_id.department_id.id),
                                  ])
                         else:
                             employee_ids = record.sudo().env['hr.employee'].search([
                                 '|', ('user_role_id', 'in', button_id.users_role_group_ids.user_role_ids.ids), ('user_role_ids', 'in', button_id.users_role_group_ids.user_role_ids.ids),
-                                '|', ('department_id', '=', record.env.user.employee_id.department_id.id), ('department_ids', 'in', record.env.user.employee_id.department_id.id),])
+                                '|', ('department_id', '=', button_id.node_id.department_id.id), ('department_ids', 'in', button_id.node_id.department_id.id),])
 
                     if record.env.user.employee_id.id in employee_ids.ids:
                         record.state = button_id.node_id.node_name