diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php b/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
index e1e68405a..58cee82d7 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
@@ -19,9 +19,11 @@ class ActionsByEmail
                 case 'configuration':
                     require_once 'classes/model/AbeConfiguration.php';
                     $abeConfigurationInstance = new \AbeConfiguration();
-                    $noteValues = json_decode($feature['fields']['ABE_CASE_NOTE_IN_RESPONSE']);
-                    foreach ($noteValues as $value) {
-                        $feature['fields']['ABE_CASE_NOTE_IN_RESPONSE'] = $value;
+                    if(isset($feature['fields']['ABE_CASE_NOTE_IN_RESPONSE'])){
+                        $noteValues = json_decode($feature['fields']['ABE_CASE_NOTE_IN_RESPONSE']);
+                        foreach ($noteValues as $value) {
+                            $feature['fields']['ABE_CASE_NOTE_IN_RESPONSE'] = $value;
+                        }
                     }
                     $abeConfigurationInstance->createOrUpdate($feature['fields']);
                     break;
@@ -50,8 +52,12 @@ class ActionsByEmail
         $result->next();
         $configuration = array();
         if ($configuration = $result->getRow()) {
-            $configuration['ABE_EMAIL_FIELD_VALUE'] = $configuration['ABE_EMAIL_FIELD'];
-            $configuration['ABE_ACTION_FIELD_VALUE'] = $configuration['ABE_ACTION_FIELD'];
+            $configuration['ABE_UID'] = $configuration['ABE_UID'];
+            $configuration['ABE_TYPE'] = $configuration['ABE_TYPE'];
+            $configuration['ABE_TEMPLATE'] = $configuration['ABE_TEMPLATE'];
+            $configuration['ABE_SUBJECT_FIELD'] = $configuration['ABE_SUBJECT_FIELD'];
+            $configuration['ABE_EMAIL_FIELD'] = $configuration['ABE_EMAIL_FIELD'];
+            $configuration['ABE_ACTION_FIELD'] = $configuration['ABE_ACTION_FIELD'];
             $configuration['ABE_CASE_NOTE_IN_RESPONSE'] = $configuration['ABE_CASE_NOTE_IN_RESPONSE'] ? '["1"]' : '[]';
         }
         $configuration['feature'] = 'ActionsByEmail';
diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php b/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php
index a2a01412f..34d05b7d9 100644
--- a/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php
+++ b/workflow/engine/src/ProcessMaker/Services/Api/Project/Activity.php
@@ -118,12 +118,11 @@ class Activity extends Api
             }
             $task = new \ProcessMaker\BusinessModel\Task();
             $properties = $task->updateProperties($prj_uid, $act_uid, $request_data);
-
             /*----------------------------------********---------------------------------*/
             if (\PMLicensedFeatures
                 ::getSingleton()
                 ->verifyfeature('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=')) {
-                if (isset($request_data['properties']['_features']) && !empty($request_data['properties']['_features']['ActionsByEmail']['fields']['ABE_UID'])) {
+                if (isset($request_data['properties']['_features'])) {
                     $actionsByEmailService = new \ProcessMaker\BusinessModel\ActionsByEmail();
                     $actionsByEmailService->saveConfiguration($request_data['properties']['_features']);
                 }