diff --git a/booking.emails.inc b/booking.emails.inc
index cabb009..b9ffd1c 100644
--- a/booking.emails.inc
+++ b/booking.emails.inc
@@ -170,7 +170,7 @@ function _booking_manual_email_form_selecttype_dropdown_callback($form, &$form_s
   form_set_cache($form['#build_id'], $cached_form, $form_state);
 
   // configure new tableselect based on old table select 
-  $form['new']['table']['#options'] = $cached_form['table']['#options'];
+  $form['new']['table'] = $cached_form['table'];
 	
 	//set new default values
 	$form['new']['table']['#default_value'] = $new_default_values;
@@ -186,8 +186,8 @@ 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);
   // remove current value
-  unset($form['table']['#default_value']);
-  unset($form['table']['#value']);
+  //unset($form['table']['#default_value']);
+  //unset($form['table']['#value']);
 
   // update the tableselect
   $commands = array();