Index: watcher_checkboxes/watcher_checkboxes.module
===================================================================
--- watcher_checkboxes/watcher_checkboxes.module	(revision 32695)
+++ watcher_checkboxes/watcher_checkboxes.module	(working copy)
@@ -35,17 +35,20 @@
   // if checks passed, add the checkbox to the form
   global $user;
   if (user_access('use watcher') && $show_checkbox) {
-    $state = $form_state['values']['watcher_enable'];
-    if (!isset($state)) {
-      $state = $nid ? _watcher_user_is_watching_node($user, $nid) : false;
+    if (isset($form_state['values']['watcher_enable'])) {
+      $state = $form_state['values']['watcher_enable'];
+    } else if ($nid && _watcher_user_is_watching_node($user, $nid)) {
+      $state = _watcher_user_is_watching_node($user, $nid);
+    } else if ($form_id == 'comment_form') {
+      $state = _watcher_user_settings_load('watcher_autowatch_commented_on', $user->uid);
+    } else {
+      $state = _watcher_user_settings_load('watcher_autowatch_posted', $user->uid);
     }
-        
     $form['watcher_enable'] = array(
-                                    '#type' => 'checkbox',
-                                    '#title' => t('Notify me of replies or changes to this post'),
-                                    '#default_value' => $state,
-                                    );
-    
+      '#type' => 'checkbox',
+      '#title' => t('Notify me of replies or changes to this post'),
+      '#default_value' => $state,
+    );
     if ($form_id == 'comment_form') {
       $form['#submit'][] = '_watcher_checkboxes_form_submit';
     } else {