diff --git a/workflow/engine/classes/class.processes.php b/workflow/engine/classes/class.processes.php
index 152f6e286..2449396eb 100755
--- a/workflow/engine/classes/class.processes.php
+++ b/workflow/engine/classes/class.processes.php
@@ -4178,9 +4178,11 @@ class Processes
 
             foreach ($arrayData as $value) {
                 unset($value['EMAIL_EVENT_FROM']);
+                unset($value['EMAIL_SERVER_UID']);
 
                 if (!empty($arrayEmailServerDefault)) {
                     $value['EMAIL_EVENT_FROM'] = $arrayEmailServerDefault['MESS_ACCOUNT'];
+                    $value['EMAIL_SERVER_UID'] = $arrayEmailServerDefault['MESS_UID'];
                 }
 
                 $emailEventData = $emailEvent->save($processUid, $value);
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/EmailEvent.php b/workflow/engine/src/ProcessMaker/BusinessModel/EmailEvent.php
index bbcce72f0..520d5ec8d 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/EmailEvent.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/EmailEvent.php
@@ -469,7 +469,7 @@ class EmailEvent
                     $emailTo = $email;
                 }
             }
-            if (!empty($emailTo) && $arrayData[3] != '') {
+            if (!empty($emailTo)) {
                 $subject = $arrayData[5];
                 $subject = \G::replaceDataField($arrayData[5], $arrayApplicationData['APP_DATA']);
                 \PMFSendMessage($appUID, $configEmailData['MESS_ACCOUNT'], $emailTo, '', '', $subject,