diff --git a/node_reminder.module b/node_reminder.module
index 899db6d..1263b60 100644
--- a/node_reminder.module
+++ b/node_reminder.module
@@ -219,9 +219,11 @@ function node_reminder_node_validate($node, $form, &$form_state) {
  *  reminder object
  */
 function node_reminder_save(&$reminder) {
-  // check to see if the reminder exists
+  $reminder->active = strlen($reminder->amount_of_time) > 0 ? 1 : 0;
   $reminder->notify_on = strtotime(date('Y-m-d H:i:s', $reminder->from_date) . "+ {$reminder->amount_of_time} {$reminder->unit_of_time}");
   unset($reminder->from_date);
+
+  // check to see if the reminder exists
   $reminder_current = node_reminder_load($reminder->nid);
   if ($reminder_current) {
     drupal_write_record('node_reminder', $reminder, 'nid');
@@ -465,7 +467,7 @@ function node_reminder_cron_process() {
 function node_reminder_list() {
   $reminders = array();
 
-  $result = db_query("SELECT * FROM {node_reminder}");
+  $result = db_query("SELECT * FROM {node_reminder} WHERE active = 1");
   foreach ($result as $reminder) {
     $reminders[] = $reminder;
   }
