diff --git a/booking.emails_admin.inc b/booking.emails_admin.inc
index 2752342..aedbd35 100644
--- a/booking.emails_admin.inc
+++ b/booking.emails_admin.inc
@@ -357,6 +357,11 @@ function booking_manual_email_form($form, &$form_state, $input_option = "")
 			'wrapper' => 'booking_email_default_ids_wrapper',
 	    ),				
 	);	
+	
+	$form['submit'] = array (
+		'#type' => 'submit',
+		'#value' => t('Send Email'),
+	);	
 
 	$header = array(
 		'booking_nid' =>  array('data' => t('Id'), 'field' => 'nid', 'sort' => 'asc'),
@@ -503,7 +508,12 @@ function _booking_email_get_default_selection_callback($form, $form_state) {
 		'#type' => 'ajax',
 		'#commands' => array(
 			ajax_command_replace("#booking_email_default_ids_wrapper", $output_html),
-			array('command' => 'bookingEmailIDs'), // This will call the command nameOfCommand we just created in the JS file.
+			// This will call the command bookingEmailIDs in our custom JS file.
+			array('command' => 'bookingAjaxCheckboxes', 
+				'formDataElement' => 'booking_email_default_ids'
+				'formName' => 'booking_manual_email_form',
+				'checkboxName' => 'table',
+			), 
 		)
 	);
 }
diff --git a/booking.js b/booking.js
index 9c158b4..db4b8ee 100644
--- a/booking.js
+++ b/booking.js
@@ -1,10 +1,10 @@
 /**
  * Special Effects AJAX framework command.
  */
-Drupal.ajax.prototype.commands.bookingEmailIDs =  function(ajax, response, status) {
+Drupal.ajax.prototype.commands.bookingAjaxCheckboxes =  function(ajax, response, status) {
     jQuery(function($) {
         var arr = $.parseJSON($('input#booking_email_default_ids').val())
-        $('#booking-manual-email-form').find(':checkbox[name^="table"]').each(function () {
+        $('#booking-manual-email-form').find(':checkbox[name^="' . response.checkboxName .'"]').each(function () {
             //.prop() doesn't exist in Drupal's old version of jQuery so use .attr() instead
             $(this).attr("checked", ($.inArray($(this).val(), arr) != -1));
         });