--- notifications_ui/notifications_ui.module.orig	2010-01-01 14:41:49.375000000 +0100
+++ notifications_ui/notifications_ui.module	2010-01-08 13:27:52.109375000 +0100
@@ -193,7 +193,7 @@ function notifications_ui_form_alter(&$f
       // Add to comment forms.
       $node = node_load($form['nid']['#value']);
       if ($user->uid && notifications_ui_node_options($node->type, 'comment')) {
-        $form[] = notifications_ui_node_subform($node);    
+        $form += notifications_ui_node_subform($node);    
       }
       break;
     
@@ -215,7 +215,7 @@ function notifications_ui_form_alter(&$f
       if (isset($form['type']['#value']) && $form['type']['#value'] .'_node_form' == $form_id && notifications_ui_node_options($form['type']['#value'], 'form')) {
         //  Add node forms.
         $node = $form['#node'];
-        $form[] = notifications_ui_node_subform($node);
+        $form += notifications_ui_node_subform($node);
       }  
   }
 }
@@ -266,6 +266,7 @@ function notifications_ui_options_form($
       '#collapsible' => TRUE,
       '#collapsed' => TRUE,
       '#tree' => TRUE,
+      '#group' => 'additional_settings',
     );
   }
   else {