diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php
index 707b2e751..634e9a222 100755
--- a/workflow/engine/classes/class.pmFunctions.php
+++ b/workflow/engine/classes/class.pmFunctions.php
@@ -831,7 +831,7 @@ function getEmailConfiguration ()
  * @param array | $aAttachment = array() | Attachment | An Optional arrray. An array of files (full paths) to be attached to the email.
  * @param boolean | $showMessage = true | Show message | Optional parameter. Set to TRUE to show the message in the case's message history.
  * @param int | $delIndex = 0 | Delegation index of the case | Optional parameter. The delegation index of the current task in the case.
- * @param array | $config = array() | Email server configuration | An optional array: An array of parameters to be used in the Email sent (MESS_ENGINE, MESS_SERVER, MESS_PORT, MESS_FROM_MAIL, MESS_RAUTH, MESS_ACCOUNT, MESS_PASSWORD, and SMTPSecure).
+ * @param string(100) | $config = '' | Email server configuration | An optional array: An array of parameters to be used in the Email sent (MESS_ENGINE, MESS_SERVER, MESS_PORT, MESS_FROM_MAIL, MESS_RAUTH, MESS_ACCOUNT, MESS_PASSWORD, and SMTPSecure) Or String: UID of Email server .
  * @return int | | result | Result of sending email
  *
  */
diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php
index 3818d684f..3609135d0 100755
--- a/workflow/engine/classes/class.wsBase.php
+++ b/workflow/engine/classes/class.wsBase.php
@@ -923,6 +923,18 @@ class wsBase
             $licensedFeatures = & PMLicensedFeatures::getSingleton();
             /*----------------------------------********---------------------------------*/
             if (!empty($config) && $licensedFeatures->verifyfeature('nKaNTNuT1MzK0RsMEtXTnYzR09ucHF2WGNuS0hRdDBBak42WXJhNVVOOG1INEVoaU1EaTllbjBBeEJNeG9wRVJ6NmxQelhyVTBvdThzPQ==')) {
+                if(!is_array($config)){
+                    $emailServer = new EmailServer();
+                    $criteria = $emailServer->getSelAllColumns();
+                    $criteria->add(EmailServerPeer::MESS_UID, $config, CRITERIA::EQUAL);
+                    $criteria = EmailServerPeer::doSelectRS($criteria);
+                    $criteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+                    while ($criteria->next()) {
+                      $row = $criteria->getRow();
+                      $config = $row;
+                      $config['SMTPSecure'] = $row['SMTPSECURE'];
+                    }
+                }
                 $aSetup = $config;
             } else {
             /*----------------------------------********---------------------------------*/
diff --git a/workflow/engine/classes/model/EmailServer.php b/workflow/engine/classes/model/EmailServer.php
index f961d4f1a..8f0a58caf 100644
--- a/workflow/engine/classes/model/EmailServer.php
+++ b/workflow/engine/classes/model/EmailServer.php
@@ -1,5 +1,27 @@
 <?php
 class EmailServer extends BaseEmailServer
 {
+    /**
+     * Get all columns by EMAIL_SERVER
+     *
+     * @return object criteria 
+     */
+    public function getSelAllColumns(){
+        $criteria = new Criteria("workflow");
+        $criteria->addSelectColumn( EmailServerPeer::MESS_UID);
+        $criteria->addSelectColumn( EmailServerPeer::MESS_ENGINE);
+        $criteria->addSelectColumn( EmailServerPeer::MESS_SERVER);
+        $criteria->addSelectColumn( EmailServerPeer::MESS_PORT);
+        $criteria->addSelectColumn( EmailServerPeer::MESS_RAUTH);
+        $criteria->addSelectColumn( EmailServerPeer::MESS_ACCOUNT);
+        $criteria->addSelectColumn( EmailServerPeer::MESS_PASSWORD);
+        $criteria->addSelectColumn( EmailServerPeer::MESS_FROM_MAIL);
+        $criteria->addSelectColumn( EmailServerPeer::MESS_FROM_NAME);
+        $criteria->addSelectColumn( EmailServerPeer::SMTPSECURE);
+        $criteria->addSelectColumn( EmailServerPeer::MESS_TRY_SEND_INMEDIATLY);
+        $criteria->addSelectColumn( EmailServerPeer::MAIL_TO);
+        $criteria->addSelectColumn( EmailServerPeer::MESS_DEFAULT);
+        return $criteria;
+    }
 }
 
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/TriggerWizard.php b/workflow/engine/src/ProcessMaker/BusinessModel/TriggerWizard.php
index 6299c2078..607d172f9 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/TriggerWizard.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/TriggerWizard.php
@@ -565,6 +565,11 @@ class TriggerWizard
                                 break;
                             case "bool":
                             case "boolean":
+                                $paramValue = 'true';
+                                if($arrayParamData["input"][$paramName]!=''){
+                                  $paramValue = $arrayParamData["input"][$paramName];
+                                }
+                                break;
                             case "array":
                                 $paramValue = trim($arrayParamData["input"][$paramName]);
                                 break;