diff --git a/booking.emails_admin.inc b/booking.emails_admin.inc
index 9c7549a..426e4e7 100644
--- a/booking.emails_admin.inc
+++ b/booking.emails_admin.inc
@@ -278,12 +278,14 @@ function booking_emails_custom_ajax_form($node, &$form_state) {
   if (!isset($form_state['input']['email-type'])) {
     $subject_value = "";
     $body_value = "";
+    $submit_button_disabled = TRUE;
   }
   else {
     watchdog('booking_debug', 'booking_emails_custom_ajax_form user has selected email type');
     $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'];
+    $submit_button_disabled = FALSE;
   }  
 
   if(variable_get('booking_enable_html_mail', 0) == 1) {
@@ -344,7 +346,7 @@ function booking_emails_custom_ajax_form($node, &$form_state) {
   $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Save'),
-    '#disabled' => TRUE,
+    '#disabled' => $submit_button_disabled,
   );	
 
   return array (