diff --git a/include/class.staff.php b/include/class.staff.php
index 424b273e5c1eaa49e8725477cc8a5a88fedb778b..66b5422a62216276f794c7487eab6ed84c264328 100644
--- a/include/class.staff.php
+++ b/include/class.staff.php
@@ -712,14 +712,15 @@ class Staff {
                 $ost->getConfig()->getBaseUrl(),
                 $token),
         );
+
+        if(!($email=$cfg->getAlertEmail()))
+            $email = $cfg->getDefaultEmail();
+
         $info = array('email' => $email, 'vars' => &$vars);
         Signal::send('auth.pwreset.email', $this, $info);
 
         $msg = $ost->replaceTemplateVariables($template->asArray(), $vars);
 
-        if(!($email=$cfg->getAlertEmail()))
-            $email =$cfg->getDefaultEmail();
-
         $_config = new Config('pwreset');
         $_config->set($vars['token'], $this->getId());
 
diff --git a/include/client/view.inc.php b/include/client/view.inc.php
index 782653f7a62482f5d6023cc0c79420f8d05ae0fe..f6bac88409d136cb6495b588f5cfe3c80549dae2 100644
--- a/include/client/view.inc.php
+++ b/include/client/view.inc.php
@@ -62,7 +62,7 @@ if(!$dept || !$dept->isPublic())
 if($ticket->getThreadCount() && ($thread=$ticket->getClientThread())) {
     $threadType=array('M' => 'message', 'R' => 'response');
     foreach($thread as $entry) {
-        if($entry['body'], '-')
+        if ($entry['body'] == '-')
             $entry['body'] = '(EMPTY)';
 
         //Making sure internal notes are not displayed due to backend MISTAKES!
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index 9d5cc3a704538824679d612920b561ccee226e0f..0d77e61085956ada27258e68a688317a684c1775 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -332,7 +332,7 @@ if(!$cfg->showNotesInline()) { ?>
         $types[] = 'N';
     if(($thread=$ticket->getThreadEntries($types))) {
        foreach($thread as $entry) {
-           if($entry['body'], '-')
+           if ($entry['body'] == '-')
                $entry['body'] = '(EMPTY)';
            ?>
         <table class="<?php echo $threadTypes[$entry['thread_type']]; ?>" cellspacing="0" cellpadding="1" width="940" border="0">