diff -rup /watcher/watcher.module /watcher.patched/watcher.module
--- /watcher/watcher.module	2010-10-26 16:39:32.000000000 -0400
+++ /watcher.patched/watcher.module	2010-10-30 12:36:54.000000000 -0400
@@ -1658,7 +1658,7 @@ function _watcher_watch_toggle($node, $m
         // Confirm the action
         $out = array();
         $out[] = array(
-          '#value' => '<h3>' . t('Are you sure you want to STOP watching all posts %email currently watches on this site? This action cannot be undone.', array('%email' =>  check_plain($recipient_user->mail))) . '</h3>' . '<p style="font-weight: bold;">'. l('Yes, I am sure.', 'user/'. $user->uid .'/watcher/toggle/'. $nid .'/unwatch-all/'. $mail .'/confirm', array('query' => $link_query)) .'</p>',
+          '#value' => '<h3>' . t('Are you sure you want to STOP watching all posts %email currently watches on this site? This action cannot be undone.', array('%email' =>  check_plain($recipient_user->mail))) . '</h3>' . '<p style="font-weight: bold;">'. l(t('Yes, I am sure.'), 'user/'. $user->uid .'/watcher/toggle/'. $nid .'/unwatch-all/'. $mail .'/confirm', array('query' => $link_query)) .'</p>',
         );
         return drupal_render($out);
       }
@@ -3012,19 +3012,29 @@ function _watcher_watch_toggle_anonymous
 
   // If the user wants to start watching, present what to watch for
   if ($watch_action == 'watch') {
-    $form['watcher']['what'] = array(
-      '#type' => 'select',
-      '#title' => t('What to watch for'),
-      '#options' => array(
-        'all' => t('Updates and new comments'),
-        'comments' => t('Only new comments'),
-        'updates' => t('Only updates'),
-    ),
-      '#default_value' => $what,
-      '#description' => t('Choose to be informed about new comments, updates (this post being changed) or both.'),
-      '#required' => true,
-      '#weight' => 10,
-    );
+  	if ($node->comment == 2) {
+	    $form['watcher']['what'] = array(
+	      '#type' => 'select',
+	      '#title' => t('What to watch for'),
+	      '#options' => array(
+	        'all' => t('Updates and new comments'),
+	        'comments' => t('Only new comments'),
+	        'updates' => t('Only updates'),
+	    ),
+	      '#default_value' => $what,
+	      '#description' => t('Choose to be informed about new comments, updates (this post being changed) or both.'),
+	      '#required' => true,
+	      '#weight' => 10,
+	    );
+  	}
+  	else {
+	    $form['watcher']['what'] = array(
+	      '#type' => 'hidden',
+	      '#value' => 'updates',
+	      '#required' => true,
+	      '#weight' => 10,
+	    );
+  	}
   }
 
   $form['watcher']['submit'] = array(