diff --git a/booking.emails_admin.inc b/booking.emails_admin.inc
index 4935ac1..9765558 100644
--- a/booking.emails_admin.inc
+++ b/booking.emails_admin.inc
@@ -273,7 +273,7 @@ function booking_emails_custom_ajax_form($node, &$form_state) {
   }
 
   // Populate some default values if a selection has already been made
-  watchdog('booking_debug', 'booking_emails_custom_ajax_form state: <pre>@info</pre>', array('@info' => print_r( $form_state, true)));
+  //watchdog('booking_debug', 'booking_emails_custom_ajax_form state: <pre>@info</pre>', array('@info' => print_r( $form_state, true)));
 
   if (!isset($form_state['input']['email-type'])) {
     $subject_value = "";
@@ -282,10 +282,7 @@ function booking_emails_custom_ajax_form($node, &$form_state) {
   else {
     $emailtype = $form_state['input']['email-type'];
     $subject_value = $form_state['input']['booking_email_subjectline_custom'];
-    $body_value = $form_state['input']['booking_email_body_custom']['value'];
-    //$subject_value = variable_get('booking_email_subject_' . $emailtype, '');
-    //$body_value = variable_get('booking_email_' . $emailtype, '');
-    //$body_value = isset($body_value['format']) ? $body_value['value'] : $body_value;    
+    $body_value = $form_state['input']['booking_email_body_custom']['value']; 
   }  
 
   if(variable_get('booking_enable_html_mail', 0) == 1) {
@@ -368,7 +365,7 @@ function booking_emails_custom_ajax_form_callback($form, &$form_state) {
     $form['form']['storage']['emailtype'] = $emailtype;
   }  
 
-  watchdog('booking_debug', 'booking_emails_custom_ajax_form_callback: <pre>@info</pre>', array('@info' => print_r( $form, true)));
+  //watchdog('booking_debug', 'booking_emails_custom_ajax_form_callback: <pre>@info</pre>', array('@info' => print_r( $form, true)));
 
   // Rebuild the form
   $form_state['rebuild'] = TRUE;