diff -urNp notify-head/notify.module notify-custmsg/notify.module
--- notify-head/notify.module	2006-08-11 14:24:47.000000000 -0700
+++ notify-custmsg/notify.module	2006-11-23 08:16:39.000000000 -0800
@@ -159,7 +270,14 @@ function notify_admin() {
  * Submit for the notify_admin form.
  */
 function notify_admin_submit($form_id, $form_values) {
-  if ($form_values['submitandsendnow'] == t('Save and send now')) {
+  $op = $_POST['op'];
+
+  foreach ($form_values['users'] as $uid => $settings) {
+    db_query('UPDATE {notify} SET node = %d, teasers = %d, comment = %d WHERE uid = %d', $settings['node'], $settings['teasers'], $settings['comment'], $uid);
+  }
+  drupal_set_message(t('Notify settings saved.'));
+
+  if ($op == t('Save and send now')) {
     $status = _notify_send();
     variable_set('notify_send_last', time());
     cache_clear_all('variables');
@@ -174,13 +292,6 @@ function notify_admin_submit($form_id, $
       drupal_set_message(t('No notification e-mails needed to be sent.'));
     }
   }
-
-  foreach ($form_values['users'] as $uid => $settings) {
-    db_query('UPDATE {notify} SET node = %d, teasers = %d, comment = %d WHERE uid = %d', $settings['node'], $settings['teasers'], $settings['comment'], $uid);
-  }
-
-  drupal_set_message(t('Notify settings saved.'));
-  return '';
 }
 
 /**