diff --git a/booking.emails_admin.inc b/booking.emails_admin.inc
index 195809e..4bc536a 100644
--- a/booking.emails_admin.inc
+++ b/booking.emails_admin.inc
@@ -363,10 +363,10 @@ function booking_emails_custom_ajax_form_callback($form, &$form_state) {
     // TODO : Figure out what this should be if HTML emails are NOT enabled
     $form['form']['email-definition']['booking_email_body_custom']['value']['#value'] = $text;
 
-    $form_state['form']['storage']['emailtype'] = $emailtype;
+    $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;