diff --git a/booking.emails.inc b/booking.emails.inc
index aef8259..ac7028a 100644
--- a/booking.emails.inc
+++ b/booking.emails.inc
@@ -282,8 +282,8 @@ function _booking_manual_email_selecttype_dropdown_callback($form, &$form_state)
   return array('#type' => 'ajax', '#commands' => $commands);	
 	*/
   // update cached options for tableselect
-  $cached_form = form_get_cache($form['#build_id'], $form_state);
-	watchdog('booking_debug', "<pre>Manual email cached form for tableselect\n@info</pre>", array('@info' => print_r( $cached_form['table'], true)));
+  //$cached_form = form_get_cache($form['#build_id'], $form_state);
+	//watchdog('booking_debug', "<pre>Manual email cached form for tableselect\n@info</pre>", array('@info' => print_r( $cached_form['table'], true)));
 
 	//unset old tableselect
 	unset($form['table']);
@@ -293,7 +293,7 @@ function _booking_manual_email_selecttype_dropdown_callback($form, &$form_state)
 		'#type' => 'tableselect',
 		'#header' => $header,
 		'#options' => $options,
-		//'#default_value' => $values,
+		//'#default_value' => $new_default_values,
 		'#empty' => t('No attendees found.'),
 		'#attributes' => array('id' => 'sort-table'),
     '#prefix' => '<div id="manual-email-attendees-items">',
@@ -303,7 +303,8 @@ function _booking_manual_email_selecttype_dropdown_callback($form, &$form_state)
 	//$form['table']['#options'] = $options;
 	
 	//set new default values
-	$form['table']['#default_value'] = $new_default_values;
+	//$form['table']['#default_value'] = $new_default_values;
+	form_builder($form['#form_id'], $form['table'], $form_state);
 	watchdog('booking_debug', "<pre>Manual email new form table\n@info</pre>", array('@info' => print_r( $form['table'], true)));	
 	watchdog('booking_debug', "<pre>Manual email new default values\n@info</pre>", array('@info' => print_r( $form['table']['#default_value'], true)));
 	watchdog('booking_debug', "<pre>Manual email new form array\n@info</pre>", array('@info' => print_r( $form, true)));