diff --git a/sites/all/modules/node_reminder/node_reminder.install b/sites/all/modules/node_reminder/node_reminder.install
index c84b9d7..1405ec3 100644
--- a/sites/all/modules/node_reminder/node_reminder.install
+++ b/sites/all/modules/node_reminder/node_reminder.install
@@ -23,7 +23,7 @@ function node_reminder_schema() {
 	'description' => t('Stores the node reminder information.'),
     'fields' => array(
          'nid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE),
-         'notify_on' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => FALSE),
+         'notify_on' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE),
          'email' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE),
          'amount_of_time' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE),
          'unit_of_time' => array('type' => 'varchar', 'length' => '50', 'not null' => TRUE),
diff --git a/sites/all/modules/node_reminder/node_reminder.module b/sites/all/modules/node_reminder/node_reminder.module
index 899db6d..f9d84aa 100644
--- a/sites/all/modules/node_reminder/node_reminder.module
+++ b/sites/all/modules/node_reminder/node_reminder.module
@@ -224,9 +224,13 @@ function node_reminder_save(&$reminder) {
   unset($reminder->from_date);
   $reminder_current = node_reminder_load($reminder->nid);
   if ($reminder_current) {
-    drupal_write_record('node_reminder', $reminder, 'nid');
+    if ($reminder->amount_of_time != 0) {
+      drupal_write_record('node_reminder', $reminder, 'nid');
+    } else {
+      node_reminder_delete($reminder->nid);
+    }
   }
-  else {
+  else if ($reminder->amount_of_time != 0) {
     drupal_write_record('node_reminder', $reminder);
   }
 }
