diff --git a/zmsentities/src/Zmsentities/Helper/Messaging.php b/zmsentities/src/Zmsentities/Helper/Messaging.php
index fc0090d10..39e7fbc2d 100644
--- a/zmsentities/src/Zmsentities/Helper/Messaging.php
+++ b/zmsentities/src/Zmsentities/Helper/Messaging.php
@@ -115,10 +115,9 @@ public static function getMailContent(
         }
 
         $template = self::getTemplate('mail', $status, $mainProcess);
-        return $template;
-        //if ($initiator) {
-        //    $template = self::getTemplate('admin', $status);
-        //}
+        if ($initiator) {
+            $template = self::getTemplate('admin', $status);
+        }
         if (!$template) {
             $exception = new \BO\Zmsentities\Exception\TemplateNotFound("Template for status $status not found");
             $exception->data = $status;