diff --git a/sites/all/modules/watcher/watcher.db.inc b/sites/all/modules/watcher/watcher.db.inc
index a283370..d3dff01 100644
--- a/sites/all/modules/watcher/watcher.db.inc
+++ b/sites/all/modules/watcher/watcher.db.inc
@@ -417,7 +417,7 @@ function _watcher_db_user_settings_uid_custom($uid) {
  *     An array of objects with uid as key representing users, with attributes uid, mail and name
  */
 function _watcher_db_get_users_notify_node_update($nid, $uid_exclude) {
-  $sql = "SELECT wn.uid, wn.mail wnmail, u.mail umail, u.name FROM {watcher_nodes} wn LEFT JOIN {watcher_user_settings} wus ON wus.uid = wn.uid LEFT JOIN {users} u ON u.uid = wus.uid WHERE nid = %d AND ((wn.uid <> 0 AND wn.uid <> %d AND notifications_updates = 1 AND send_email = 1) OR (wn.uid = 0 AND (watch_for = 1 OR watch_for = 3)))";
+  $sql = "SELECT wn.uid, wn.mail wnmail, u.mail umail, u.name FROM {watcher_nodes} wn LEFT JOIN {watcher_user_settings} wus ON wus.uid = wn.uid LEFT JOIN {users} u ON u.uid = wus.uid WHERE nid = %d AND ((wn.uid <> 0 AND wn.uid <> %d AND notifications_updates = 1 AND send_email = 1 and u.status = 1) OR (wn.uid = 0 AND (watch_for = 1 OR watch_for = 3)))";
   $res = db_query($sql, $nid, $uid_exclude);
   $users = array();
   while ($row = db_fetch_object($res)) {
@@ -439,7 +439,7 @@ function _watcher_db_get_users_notify_node_update($nid, $uid_exclude) {
  *     An array of objects with uid as key representing users, with attributes uid, mail and name
  */
 function _watcher_db_get_users_notify_comment_insert($nid, $uid_exclude) {
-  $sql = 'SELECT wn.uid, wn.mail wnmail, u.mail umail, u.name FROM {watcher_nodes} wn LEFT JOIN {watcher_user_settings} wus ON wus.uid = wn.uid LEFT JOIN {users} u ON u.uid = wus.uid WHERE nid = %d AND ((wn.uid <> 0 AND wn.uid <> %d AND notifications_new_comments = 1 AND send_email = 1) OR (wn.uid = 0 AND (watch_for = 1 OR watch_for = 2)))';
+  $sql = 'SELECT wn.uid, wn.mail wnmail, u.mail umail, u.name FROM {watcher_nodes} wn LEFT JOIN {watcher_user_settings} wus ON wus.uid = wn.uid LEFT JOIN {users} u ON u.uid = wus.uid WHERE nid = %d AND ((wn.uid <> 0 AND wn.uid <> %d AND notifications_new_comments = 1 AND send_email = 1 and u.status = 1) OR (wn.uid = 0 AND (watch_for = 1 OR watch_for = 2)))';
   $res = db_query($sql, $nid, $uid_exclude);
   $users = array();
   while ($row = db_fetch_object($res)) {
@@ -461,7 +461,7 @@ function _watcher_db_get_users_notify_comment_insert($nid, $uid_exclude) {
  *      An array of objects with uid as key representing users, with attributes uid, mail and name
  */
 function _watcher_db_get_users_notify_about_node($nid, $uid_exclude) {
-  $sql = 'SELECT wn.uid, wn.mail wnmail, u.mail umail, u.name FROM {watcher_nodes} wn LEFT JOIN {users} u ON u.uid = wn.uid WHERE nid = %d AND ((wn.uid <> 0 AND wn.uid <> %d AND send_email = 1) OR (NOT ISNULL(watch_for)))';
+  $sql = 'SELECT wn.uid, wn.mail wnmail, u.mail umail, u.name FROM {watcher_nodes} wn LEFT JOIN {users} u ON u.uid = wn.uid WHERE nid = %d AND ((wn.uid <> 0 AND wn.uid <> %d AND send_email = 1 and u.status = 1) OR (NOT ISNULL(watch_for)))';
   $res = db_query($sql, $nid, $uid_exclude);
   $users = array();
   while ($row = db_fetch_object($res)) {