diff --git a/booking.emails_admin.inc b/booking.emails_admin.inc
index e0309e7..f489523 100644
--- a/booking.emails_admin.inc
+++ b/booking.emails_admin.inc
@@ -278,14 +278,12 @@ function booking_emails_custom_ajax_form($node, &$form_state) {
   if (!isset($form_state['input']['email-type'])) {
     $subject_value = "";
     $body_value = "";
-    $submit_button_disabled = FALSE;
   }
   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 = TRUE;
+    $body_value = $form_state['input']['booking_email_body_custom']['value'];
   }  
 
   if(variable_get('booking_enable_html_mail', 0) == 1) {
@@ -297,6 +295,9 @@ function booking_emails_custom_ajax_form($node, &$form_state) {
     $form_format = NULL;
   }  
 
+  $form['#prefix'] = '<div id="booking_emails_custom_fieldset_wrapper">';
+  $form['#suffix'] = '</div>';  
+
   //include the token definitions
   $form['tokens'] = array(
     '#theme' => 'token_tree',
@@ -319,8 +320,8 @@ function booking_emails_custom_ajax_form($node, &$form_state) {
   $form['email-definition'] = array(
     '#type' => 'fieldset',
     '#title' => 'Email Definition',
-    '#prefix' => '<div id="booking_emails_custom_fieldset_wrapper">',
-    '#suffix' => '</div>'    
+    //'#prefix' => '<div id="booking_emails_custom_fieldset_wrapper">',
+    //'#suffix' => '</div>'    
   );
 
   $form['email-definition']['booking_email_subjectline_custom'] = array (
@@ -340,20 +341,11 @@ function booking_emails_custom_ajax_form($node, &$form_state) {
     '#format' => $form_format,        
   );  
 
-  if (!isset($form_state['input']['email-type'])) {
-    $form['email-definition']['submit'] = array(
-      '#type' => 'submit',
-      '#value' => t('Save'),
-      '#disabled' => TRUE,
-    );	
-  }
-  else {
-    $form['email-definition']['submit'] = array(
-      '#type' => 'submit',
-      '#value' => t('Save'),
-      '#disabled' => FALSE,
-    );	    
-  }
+  $form['email-definition']['submit'] = array(
+    '#type' => 'submit',
+    '#value' => t('Save'),
+    '#disabled' => TRUE,
+  );	
 
   return array (
     'form' => $form,
@@ -381,12 +373,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;
+    $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;
+    $form['form']['submit']['#disabled'] = TRUE;
   }
 
   watchdog('booking_debug', 'booking_emails_custom_ajax_form_callback: <pre>@info</pre>', array('@info' => print_r( $form, true)));