diff --git a/booking.emails.inc b/booking.emails.inc
index 70a2a60..b70c3c9 100644
--- a/booking.emails.inc
+++ b/booking.emails.inc
@@ -193,8 +193,7 @@ function _booking_manual_email_generate_options() {
 			'booking_fully_paid' => $data->booking_payment_complete == 'Y' ? 'Yes' : 'No',
 			'welfare_required' => $data->booking_welfare_required == 'Y' ? 'Yes' : 'No',
 			'travel_form' => $data->tid > 0 ? 'Yes' : 'No',
-			'#attributes' => array('class' => array($class), '#name' => array('table[' . $data->nid . ']')),
-			'#name' => array('table2[' . $data->nid . ']'),
+			'#attributes' => array('class' => array($class)),
 		);
 		
 		if (variable_get('booking_enable_studygroups', 0) == 1)	{
@@ -263,6 +262,7 @@ function _booking_manual_email_selecttype_dropdown_callback($form, &$form_state)
     '#prefix' => '<div id="manual-email-attendees-items">',
     '#suffix' => '</div>',
 		'#value' => t('test'),
+		'#parents' => array('table'),
 	);	
 	watchdog('booking_debug', "<pre>Manual email new form table\n@info</pre>", array('@info' => print_r( $form['table'], true)));	
 	//$form['table']['#default_value'] = $new_default_values;