diff --git a/workflow/engine/classes/model/AppNotes.php b/workflow/engine/classes/model/AppNotes.php
index a98d7e793..76f4a635e 100644
--- a/workflow/engine/classes/model/AppNotes.php
+++ b/workflow/engine/classes/model/AppNotes.php
@@ -157,7 +157,7 @@ class AppNotes extends BaseAppNotes {
       $oCase = new Cases ();
       $aFields = $oCase->loadCase( $appUid );
       $configNoteNotification['subject']= G::LoadTranslation('ID_MESSAGE_SUBJECT_NOTE_NOTIFICATION')." @#APP_TITLE ";
-      $configNoteNotification['body']   = G::LoadTranslation('ID_CASE') . ": @$APP_TITLE<br />" . G::LoadTranslation('ID_AUTHOR').": $authorName<br /><br />$noteContent";
+      $configNoteNotification['body']   = G::LoadTranslation('ID_CASE') . ": @#APP_TITLE<br />" . G::LoadTranslation('ID_AUTHOR').": $authorName<br /><br />$noteContent";
 
       if ($sFrom == '') {
         $sFrom = '"ProcessMaker"';
diff --git a/workflow/engine/methods/setup/emails_Ajax.php b/workflow/engine/methods/setup/emails_Ajax.php
index 40c757839..ca83e2bfc 100644
--- a/workflow/engine/methods/setup/emails_Ajax.php
+++ b/workflow/engine/methods/setup/emails_Ajax.php
@@ -254,7 +254,7 @@ function sendTestMail() {
     'MESS_ACCOUNT'  => $_POST['MESS_ACCOUNT'],
     'MESS_PASSWORD' => $_POST['MESS_PASSWORD'],
     'SMTPAuth'      => $_POST['SMTPAuth'],
-    'SMTPSecure'    => $_POST['SMTPSecure']
+    'SMTPSecure'    => isset($_POST['SMTPSecure'])?$_POST['SMTPSecure']:'none'
   ));
 
   $oSpool->create(array(