diff --git a/application/controllers/RegisterController.php b/application/controllers/RegisterController.php
index b250fd73d01..e5c1daeb51d 100644
--- a/application/controllers/RegisterController.php
+++ b/application/controllers/RegisterController.php
@@ -260,10 +260,13 @@ public function sendRegistrationEmail($iSurveyId,$iTokenId){
         $aMail['message'] = $event->get('body');
         $sTo = $event->get('to');
         $sFrom = $event->get('from');
+        $sBounce = $event->get('bounce');
+
         if ($event->get('send', true) == false)
         {
-            $this->sMessage=$event->get('message', '');
-            if($event->get('error')==null){// mimic token system, set send to today
+            $this->sMessage=$event->get('message', $this->sMailMessage); // event can send is own message
+            if($event->get('error')==null) // mimic core system, set send to today
+            {
                 $today = dateShift(date("Y-m-d H:i:s"), "Y-m-d H:i", Yii::app()->getConfig('timeadjust'));
                 $oToken->sent=$today;
                 $oToken->save();
diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
index 028530141c6..75eeb0ac5b9 100644
--- a/application/controllers/admin/tokens.php
+++ b/application/controllers/admin/tokens.php
@@ -1574,6 +1574,7 @@ function email($iSurveyId, $tokenids = null)
                         $modmessage = $event->get('body');
                         $to = $event->get('to');
                         $from = $event->get('from');
+                        $bounce = $event->get('bounce');
                         if ($event->get('send', true) == false)
                         {
                             // This is some ancient global used for error reporting instead of a return value from the actual mail function..
@@ -1582,7 +1583,7 @@ function email($iSurveyId, $tokenids = null)
                         }
                         else
                         {
-                            $success = SendEmailMessage($modmessage, $modsubject, $to, $from, Yii::app()->getConfig("sitename"), $bHtml, getBounceEmail($iSurveyId), $aRelevantAttachments, $customheaders);
+                            $success = SendEmailMessage($modmessage, $modsubject, $to, $from, Yii::app()->getConfig("sitename"), $bHtml, $bounce, $aRelevantAttachments, $customheaders);
                         }
 
                         if ($success)