diff --git a/node_reminder.module b/node_reminder.module
index 9674ddf..9cd9e1c 100644
--- a/node_reminder.module
+++ b/node_reminder.module
@@ -45,19 +45,19 @@ function node_reminder_permission() {
 function node_reminder_form_alter(&$form, $form_state, $form_id) {
   $content_types = variable_get('node_reminder_node_types', array());
 
-  if (!empty($content_types) && isset($form['type']) && isset($form['#node']) && 
-	  $form['type']['#value'] .'_node_form' == $form_id &&
-	  in_array($form['type']['#value'], $content_types, true)) 
+  if (!empty($content_types) && isset($form['type']) && isset($form['#node']) &&
+    $form['type']['#value'] .'_node_form' == $form_id &&
+    in_array($form['type']['#value'], $content_types, true))
   {
     $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->notify_on = isset($form['#node']->reminder->notify_on) ? $form['#node']->reminder->notify_on : 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;
-    $reminder->notify_on = isset($form['#node']->reminder->notify_on) ? $form['#node']->reminder->notify_on : NULL;
+    $reminder->repeat_enabled = isset($form['#node']->reminder->repeat_enabled) ? $form['#node']->reminder->repeat_enabled : NULL;
     $reminder->note = isset($form['#node']->reminder->note) ? $form['#node']->reminder->note : NULL;
-    $reminder->repeat_on = isset($form['#node']->reminder->repeat_on) ? $form['#node']->reminder->repeat_on : NULL;
+    $reminder->active = isset($form['#node']->reminder->active) ? $form['#node']->reminder->active : NULL;
 
     $form += node_reminder_form($form_state, $reminder);
     drupal_add_js(drupal_get_path('module', 'node_reminder') . '/js/node_reminder.node_edit.js');
@@ -87,7 +87,7 @@ function node_reminder_form($form_state, $reminder) {
   $form['reminder'] = array(
     '#type' => 'fieldset',
     '#title' => t('Reminder'),
-	'#group' => 'additional_settings',
+    '#group' => 'additional_settings',
     '#collapsible' => TRUE,
     '#collapsed' => FALSE,
     '#access' => user_access('set node reminders'),
@@ -133,10 +133,10 @@ function node_reminder_form($form_state, $reminder) {
     '#required' => TRUE,
   );
 
-  $form['reminder']['repeat_on'] = array(
+  $form['reminder']['repeat_enabled'] = array(
     '#title' => t('Repeat Reminder'),
     '#type' => 'checkbox',
-	'#default_value' => $reminder->repeat_on ? true : false,
+  '#default_value' => $reminder->repeat_enabled ? TRUE : FALSE,
   );
 
   $form['reminder']['note'] = array(
@@ -187,7 +187,7 @@ function node_reminder_form_submit($form, &$form_state) {
   $reminder->from_date = time();
   $reminder->nid = $form_state['values']['nid'];
   $reminder->note = $form_state['values']['note'];
-  $reminder->repeat_on = $form_state['values']['repeat_on'];
+  $reminder->repeat_enabled = $form_state['values']['repeat_enabled'];
   node_reminder_save($reminder);
 }
 
@@ -297,29 +297,29 @@ function node_reminder_tokens($type, $tokens, array $data = array(), array $opti
  */
 function node_reminder_token_info() {
   $info['tokens']['node']['reminder'] = array(
-      'name' => t('Reminders'), 
-      'description' => t('Tokens related to node reminders.'), 
+      'name' => t('Reminders'),
+      'description' => t('Tokens related to node reminders.'),
       'type' => 'reminder',
   );
 
   $info['types']['reminder'] = array(
-      'name' => t('Reminders'), 
-      'description' => t('Tokens related to node reminders.'), 
+      'name' => t('Reminders'),
+      'description' => t('Tokens related to node reminders.'),
       'needs-data' => 'node',
   );
 
   $info['tokens']['reminder']['interval'] = array(
-      'name' => t("Interval"), 
+      'name' => t("Interval"),
       'description' => t('The amount and unit of time after which a reminder will be sent (e.g., 3 days, 6 weeks)'),
   );
 
   $info['tokens']['reminder']['url'] = array(
-      'name' => t("URL"), 
+      'name' => t("URL"),
       'description' => t('An absolute url for the reminder, suitable for sending in emails so users know which reminder triggered the message'),
   );
 
   $info['tokens']['reminder']['note'] = array(
-      'name' => t("Interval"), 
+      'name' => t("Interval"),
       'description' => t('The user defined note for the reminder'),
   );
 
@@ -379,7 +379,7 @@ function node_reminder_add_action_submit($form, &$form_state) {
   $reminder->unit_of_time = $form_state['values']['unit_of_time'];
   $reminder->email = $form_state['values']['reminder_email'];
   $reminder->note =  $form_state['values']['note'];
-  $reminder->repeat_on = $form_state['values']['repeat_on'];
+  $reminder->repeat_enabled = $form_state['values']['repeat_enabled'];
 
   return array('reminder' => $reminder);
 }
@@ -484,7 +484,7 @@ function node_reminder_send($reminder) {
     foreach ($emails as $email) {
         $email = trim($email);
         if ($result = drupal_mail('node_reminder', 'node_reminder', $email, language_default(), $params)) {
-            if (isset($reminder->repeat_on) && $reminder->repeat_on) {
+            if (isset($reminder->repeat_enabled) && $reminder->repeat_enabled) {
                 $reminder->from_date = time();
                 node_reminder_save($reminder);
             }
