diff --git a/comment_notify.module b/comment_notify.module
index 87f2cb7..1f8d2ee 100644
--- a/comment_notify.module
+++ b/comment_notify.module
@@ -430,7 +430,7 @@ function _comment_notify_mailalert($comment) {
   // Send to a subscribed author if they are not the current commenter
   $author = user_load($node->uid);
 
-  if (!empty($author->comment_notify_settings->node_notify) && $author->node_notify_mailalert == 1 && $user->uid != $author->uid && node_access('view', $node, $author)) {
+  if (!empty($author->comment_notify_settings->node_notify) && $comment->uid != $author->uid && node_access('view', $node, $author)) {
     // Get the author's language.
     $language = user_preferred_language($author);
     $raw_values = array(
@@ -483,7 +483,7 @@ function _comment_notify_mailalert($comment) {
       );
 
       foreach ($raw_values as $k => $v) {
-        $message[$k] = token_replace(t($v), array('comment' => $comment, 'node' => $node, 'user' => $user));
+        $message[$k] = token_replace(t($v), array('comment' => $comment, 'node' => $node, 'user' => $recipient_user));
       }
 
       drupal_mail('comment_notify', 'comment_notify_mail', $mail, $language, $message);
diff --git a/comment_notify.tokens.inc b/comment_notify.tokens.inc
index 2f1dab7..2b9bd03 100644
--- a/comment_notify.tokens.inc
+++ b/comment_notify.tokens.inc
@@ -46,4 +46,6 @@ function comment_notify_tokens($type, $tokens, array $data = array(), array $opt
       }
     }
   }
+  
+  return $replacements;
 }