diff --git a/booking.emails.inc b/booking.emails.inc
index 6cc8bdd..5719d2f 100644
--- a/booking.emails.inc
+++ b/booking.emails.inc
@@ -253,6 +253,13 @@ function _booking_manual_email_selecttype_ajax_callback($form, &$form_state) {
 	}			
 	
 	unset($form['table']);
+	
+	// update cached options for tableselect
+  $cached_form = form_get_cache($form['#build_id'], $form_state);
+  $cached_form['table']['#options'] = $options;
+	$cached_form['table']['#default_value'] = $new_default_values;
+  form_set_cache($form['#build_id'], $cached_form, $form_state);	
+	
 	$form['table']['#options'] = $options;
 	$form['table']['#header'] = $header;
 	$form['table']['#default_value'] = $new_default_values;