diff --git a/booking.emails.inc b/booking.emails.inc
index 4720385..04019a2 100644
--- a/booking.emails.inc
+++ b/booking.emails.inc
@@ -119,11 +119,9 @@ function booking_manual_email_form($form, &$form_state, $input_option = "")
 			}
 			$options[$data->nid]['group_roles'] = $group_text;
 		}
-		/*
-		if ($preselected == 'unpaid') {
+		if ($input_option == 'unpaid') {
 			$values[$data->nid] = ($data->booking_payment_complete == 'Y' || $data->booking_status != 1) ? FALSE : TRUE;
 		}
-		*/
 	}	
 	
 	$form['table'] = array (
@@ -131,7 +129,8 @@ function booking_manual_email_form($form, &$form_state, $input_option = "")
 		//'#multiple' => TRUE,
 		'#header' => $header,
 		'#options' => $options,
-		'#default_value' => array("1814" => TRUE),
+		//'#default_value' => array("1814" => TRUE),
+		'#default_value' => $values,
 		'#empty' => t('No attendees found.'),
 		'#attributes' => array('id' => 'sort-table'),
     '#prefix' => '<div id="manual-email-attendees-items">',
diff --git a/booking.module b/booking.module
index 1d08b58..e146273 100644
--- a/booking.module
+++ b/booking.module
@@ -290,8 +290,10 @@ function booking_menu() {
 	$items['admin/booking/manual-email'] = array(
 		'title' => 'Manually Email People',
 		'description' => 'Send manual email to registered people',
-		'page callback'                       => 'drupal_get_form',
-		'page arguments'                      => array('booking_manual_email'),
+			'page callback'                       => 'drupal_get_form',
+			'page arguments'                      => array('booking_manual_email_form'),			
+		//'page callback'                       => 'drupal_get_form',
+		//'page arguments'                      => array('booking_manual_email'),
 		'access arguments'                    => array('access administration pages'),				
 		'type' => MENU_NORMAL_ITEM,
 		);