diff --git a/booking.emails_admin.inc b/booking.emails_admin.inc
index 2f0fd1b..ee80418 100644
--- a/booking.emails_admin.inc
+++ b/booking.emails_admin.inc
@@ -340,6 +340,7 @@ function booking_emails_custom_ajax_form($node, &$form_state) {
   $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Save'),
+    '#disabled' => TRUE,
   );	
 
   return array (
@@ -368,10 +369,12 @@ function booking_emails_custom_ajax_form_callback($form, &$form_state) {
     //watchdog('booking_debug', 'custom text: <pre>@info</pre>', array('@info' => print_r( $text, true)));
     // 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['form']['submit']['#disabled'] = FALSE;
   }
   else {
     $form['form']['email-definition']['booking_email_subjectline_custom']['#value'] = '';
     $form['form']['email-definition']['booking_email_body_custom']['value']['#value'] = '';
+    $form['form']['submit']['#disabled'] = TRUE;
   }
 
   //watchdog('booking_debug', 'booking_emails_custom_ajax_form_callback: <pre>@info</pre>', array('@info' => print_r( $form, true)));