--- notify.module	2008-12-18 06:00:06.000000000 +0800
+++ notify.module.new	2009-10-22 18:30:53.833914000 +0800
@@ -86,6 +86,25 @@ function notify_admin_settings() {
       '#default_value' => variable_get(NOTIFY_NODE_TYPE . $type, 0),
     );
   }
+  
+  $form['user_register_settings'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('User registration settings'),
+    '#collapsible' => true,
+    '#collapsed' => false,
+  );
+  $form['user_register_settings']['notify_show_on_registration_form'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Show options to enable notifications on user registration form.'),
+    '#return_value' => 1,
+    '#default_value' => variable_get('notify_show_on_registration_form', 0),
+  );
+  $form['user_register_settings']['notify_decision_registration_form_default'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Default to enable notifications.'),
+    '#return_value' => 1,
+    '#default_value' => variable_get('notify_decision_registration_form_default', 0),
+  );
 
   return system_settings_form($form);
 }
@@ -116,7 +135,9 @@ function notify_user($type, &$edit, &$us
       break;
     
     case 'register':
-      return _notify_user_reg_fields();
+      if (variable_get('notify_show_on_registration_form', 0)) {
+        return _notify_user_reg_fields();
+      }
       break;
     
     case 'insert':
@@ -149,7 +170,7 @@ function _notify_user_reg_fields() {
     '#type' => 'checkbox',
     '#title' => t('Receive email notifications of news posted to this site. Notifications are sent every ' . format_interval($period).'.'),
     '#return_value' => 1,
-    '#default_value' => 1,
+    '#default_value' => variable_get('notify_decision_registration_form_default', 0),
     '#description' => t('By accepting to receive <em>daily email news notifications</em>, you will be kept informed of news associated with ' . variable_get('site_name', 'Drupal') . '.')
   );