diff --git a/booking.emails.inc b/booking.emails.inc
index 4118af5..6cc8bdd 100644
--- a/booking.emails.inc
+++ b/booking.emails.inc
@@ -42,7 +42,7 @@ function booking_manual_email()
 			'#options' => array("---" => "---",  "Unpaid" => "Unpaid", "Waiting List" => "Waiting List"),
 			'#default_value' => "---",
 			'#ajax' => array(
-				'callback' => '_booking_manual_email_selecttype_dropdown_callback',
+				'callback' => '_booking_manual_email_selecttype_ajax_callback',
 				'wrapper' => 'manual-email-attendees-items',
 				'event' => 'change',
 			),
@@ -126,7 +126,7 @@ function booking_manual_email()
 		'#multiple' => TRUE,
 		'#header' => $header,
 		'#options' => $options,
-		//'#default_value' => array("1812" => TRUE, "1813" => FALSE),
+		'#default_value' => array("1812" => TRUE, "1813" => FALSE),
 		'#empty' => t('No attendees found.'),
 		'#attributes' => array('id' => 'sort-table'),
     '#prefix' => '<div id="manual-email-attendees-items">',
@@ -224,7 +224,7 @@ function _booking_manual_email_generate_options() {
 	*/
 }
 
-function _booking_manual_email_selecttype_dropdown_callback($form, &$form_state) {
+function _booking_manual_email_selecttype_ajax_callback($form, &$form_state) {
 	
 	
 	$select_type = $form_state['values']['select-type'];
@@ -252,6 +252,7 @@ function _booking_manual_email_selecttype_dropdown_callback($form, &$form_state)
 		$new_default_values = array("1815" => TRUE);
 	}			
 	
+	unset($form['table']);
 	$form['table']['#options'] = $options;
 	$form['table']['#header'] = $header;
 	$form['table']['#default_value'] = $new_default_values;