diff --git a/booking.emails.inc b/booking.emails.inc
index ff980cb..cb4ce71 100644
--- a/booking.emails.inc
+++ b/booking.emails.inc
@@ -42,7 +42,7 @@ function booking_manual_email()
 			'#options' => array("---" => "NULL",  "Unpaid" => "Unpaid", "Waiting List" => "Waiting List"),
 			'#default_value' => "---",
 			'#ajax' => array(
-				'callback' => '_booking_manual_email_form_selecttype_dropdown_callback',
+				'callback' => '_booking_manual_email_selecttype_dropdown_callback',
 				'event' => 'change',
 			),
 	);
@@ -146,7 +146,7 @@ function booking_manual_email()
 	);
 }
 
-function _booking_manual_email_form_selecttype_dropdown_callback($form, &$form_state) {
+function _booking_manual_email_selecttype_dropdown_callback($form, &$form_state) {
 
   //$courseid = $form_state['values']['courseid'];
   //$scheduleid = $form_state['values']['scheduleid'];
@@ -173,10 +173,10 @@ function _booking_manual_email_form_selecttype_dropdown_callback($form, &$form_s
   $form['new']['table'] = $cached_form['form']['table'];	
 	watchdog('booking_debug', "<pre>Manual email new form table\n@info</pre>", array('@info' => print_r( $form['new']['table'], true)));	
 	//set new default values
-  $cached_form['table']['#default_value'] = $new_default_values;	
+  //$cached_form['table']['#default_value'] = $new_default_values;	
 	$form['new']['table']['#default_value'] = $new_default_values;
 
-  form_set_cache($form['#build_id'], $cached_form, $form_state);
+  //form_set_cache($form['#build_id'], $cached_form, $form_state);
 
   /*
 	foreach (element_children($form['items']) as $key) {
@@ -186,7 +186,7 @@ function _booking_manual_email_form_selecttype_dropdown_callback($form, &$form_s
   }
   */
   // add new radios to tableselect
-  form_builder($form['#form_id'], $form['table'], $form_state);
+  //form_builder($form['#form_id'], $form['table'], $form_state);
   // remove current value
   //unset($form['table']['#default_value']);
   //unset($form['table']['#value']);