--- disqus.module	2011-02-07 07:01:24.000000000 -0800
+++ disqus.module.new	2011-02-28 11:22:18.000000000 -0800
@@ -59,10 +59,6 @@ function disqus_nodeapi(&$node, $op, $a3
   $types = variable_get('disqus_nodetypes', array());
   if (!empty($types[$node->type])) {
     switch ($op) {
-      case 'validate':
-        $node->disqus['status'] = $node->disqus_status;
-        unset($node->disqus_status);
-        break;
       case 'load':
           // Check which Disqus domain to use.
           $domain = variable_get('disqus_domain', '');
@@ -109,7 +105,7 @@ function disqus_nodeapi(&$node, $op, $a3
       case 'insert':
         $data = array(
           'nid' => $node->nid,
-          'status' => $node->disqus_status,
+          'status' => $node->disqus['status'],
         );
         drupal_write_record('disqus', $data);
         break;
@@ -118,7 +114,7 @@ function disqus_nodeapi(&$node, $op, $a3
         db_query('DELETE FROM {disqus} WHERE nid = %d', $node->nid);
         $data = array(
           'nid' => $node->nid,
-          'status' => $node->disqus_status,
+          'status' => $node->disqus['status'],
         );
         drupal_write_record('disqus', $data);
         break;
@@ -163,10 +159,13 @@ function disqus_form_alter(&$form, $form
       );
     }
     $node = $form['#node'];
-    $form['comment_settings']['disqus_status'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Enable Disqus comments'),
-      '#default_value' => isset($node->disqus['status']) ? $node->disqus['status'] : TRUE,
+    $form['comment_settings']['disqus'] = array(
+      '#tree' => TRUE,
+      'status' => array(
+          '#type' => 'checkbox',
+          '#title' => t('Enable Disqus comments'),
+          '#default_value' => isset($node->disqus['status']) ? $node->disqus['status'] : TRUE,
+      ),
     );
   }
 }