diff --git a/node_reminder.install b/node_reminder.install
index c84b9d7..1405ec3 100644
--- a/node_reminder.install
+++ b/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/node_reminder.module b/node_reminder.module
index 899db6d..dff702a 100644
--- a/node_reminder.module
+++ b/node_reminder.module
@@ -52,6 +52,7 @@ function node_reminder_form_alter(&$form, $form_state, $form_id) {
   {
     $reminder = new stdClass;
     $reminder->nid = isset($form['#node']->nid) ? $form['#node']->nid : NULL;
+    $reminder->active = isset($form['#node']->reminder->active) ? $form['#node']->reminder->active : NULL;
     $reminder->email = isset($form['#node']->reminder->email) ? $form['#node']->reminder->email : NULL;
     $reminder->amount_of_time = isset($form['#node']->reminder->amount_of_time) ? $form['#node']->reminder->amount_of_time : NULL;
     $reminder->unit_of_time = isset($form['#node']->reminder->unit_of_time) ? $form['#node']->reminder->unit_of_time : NULL;
@@ -96,6 +97,12 @@ function node_reminder_form($form_state, $reminder) {
     $form['reminder']['nid'] = array('#type' => 'value', '#value' => $reminder->nid);
   }
 
+  $form['reminder']['active'] = array(
+    '#title' => t('Enabled'),
+    '#type' => 'checkbox',
+    '#default_value' => isset($reminder->active) ? $reminder->active : true,
+  );
+
   $form['reminder']['reminder_email'] = array(
     '#title' => t('Email Address'),
     '#description' => t('Email address that the reminder will be sent to.'),
@@ -168,6 +175,7 @@ function node_reminder_form_validate($form, &$form_state) {
  */
 function node_reminder_form_submit($form, &$form_state) {
   $reminder = new stdClass;
+  $reminder->active = $form_state['values']['active'];
   $reminder->amount_of_time = $form_state['values']['amount_of_time'];
   $reminder->unit_of_time = $form_state['values']['unit_of_time'];
   $reminder->email = $form_state['values']['reminder_email'];
@@ -219,9 +227,10 @@ function node_reminder_node_validate($node, $form, &$form_state) {
  *  reminder object
  */
 function node_reminder_save(&$reminder) {
-  // check to see if the reminder exists
   $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 +474,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;
   }
