diff --git a/booking.emails.inc b/booking.emails.inc
index d84ceb6..e23b493 100644
--- a/booking.emails.inc
+++ b/booking.emails.inc
@@ -269,19 +269,19 @@ 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\n@info</pre>", array('@info' => print_r( $cached_form, 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']);
+	unset($form['table']);
 	
   // configure new tableselect based on old table select 
-  //$form['table'] = $cached_form['form']['table'];	
-	unset($form_state['input']['table']);
+  $form['table'] = $cached_form['form']['table'];	
+	//unset($form_state['input']['table']);
 	$form['table']['#options'] = $options;
 	
 	//set new default values
-	//$form['new']['table']['#default_value'] = $new_default_values;
+	$form['table']['#default_value'] = $new_default_values;
 	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)));