diff --git a/workflow/engine/classes/model/AppDelegation.php b/workflow/engine/classes/model/AppDelegation.php
index 27ecc1875..095fae749 100644
--- a/workflow/engine/classes/model/AppDelegation.php
+++ b/workflow/engine/classes/model/AppDelegation.php
@@ -89,7 +89,7 @@ class AppDelegation extends BaseAppDelegation
                 $record = $rsCriteria->getRow();
 
                 if ($flagIncludeCurrentDel) {
-                    if (preg_match('/^(?:' . 'NORMAL|SCRIPT\-TASK|WEBENTRYEVENT|START\-MESSAGE\-EVENT|START\-TIMER\-EVENT' . ')$/', $record['TAS_TYPE'])) {
+                    if (preg_match('/^(?:' . 'SERVICE\-TASK|NORMAL|SCRIPT\-TASK|WEBENTRYEVENT|START\-MESSAGE\-EVENT|START\-TIMER\-EVENT' . ')$/', $record['TAS_TYPE'])) {
                         $arrayAppDelegationPrevious = $record;
                         $flagPrevious = false;
                     }
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php b/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
index c0c81bf22..8f707a0fc 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
@@ -360,7 +360,7 @@ class ActionsByEmail
                 if ($data[$index]['ABE_MAILSERVER_OR_MAILCURRENT'] == 0) {
                     $delegation = new AppDelegation();
                     $previousTask = $delegation->getPreviousDelegationValidTask($data[$index]['APP_UID'], $data[$index]['DEL_INDEX']);
-                    if (in_array($previousTask['TAS_TYPE'], Task::DUMMY_TASKS)) {
+                    if (in_array($previousTask['TAS_TYPE'], Task::DUMMY_TASKS) || in_array($previousTask['TAS_TYPE'], Task::$typesRunAutomatically)) {
                         $res = Task::getTask($previousTask['TAS_ID']);
                         $data[$index]['USER'] = $res->TAS_TITLE . ' (' . $previousTask['TAS_TYPE'] . ')';
                     }