diff --git a/booking.emails_admin.inc b/booking.emails_admin.inc
index 9d8daf0..f70fdd5 100644
--- a/booking.emails_admin.inc
+++ b/booking.emails_admin.inc
@@ -80,25 +80,25 @@ function booking_emails_admin() {
   $form['emails']['booking_email_bookedin_text'] = array(
     '#title' => t('Registration Successful Email'),
     '#description' => t('Text to use in an email indicating the person has booked in, paid their deposit and is not on the waiting list'),
-    '#default_value' => $form_type == 'text_format' ? variable_get('booking_email_bookedin_text')['value'] : variable_get('booking_email_bookedin_text'),
+    '#default_value' => $form_type == 'text_format' ? variable_get('booking_email_bookedin_text')['value'] : variable_get('booking_email_bookedin_text', $default_email_text),
     '#type' => $form_type,
     '#format' => $form_format,       
   );	
   $form['emails']['booking_email_regn_complete_text'] = array(
     '#title' => t('Payment Complete Email'),
-    '#type' => 'textarea',
-    //'#format' => 'full_html',
     '#description' => t('Email text to indicate a person has booked in, fully paid and is not on the waiting list. ' .
       'This will be sent either at initial registration if the full amount is paid, or when the balance is paid.'),
-    '#default_value' => variable_get('booking_email_regn_complete_text', $booking_email_regn_complete_text),
+    '#default_value' => $form_type == 'text_format' ? variable_get('booking_email_regn_complete_text')['value'] : variable_get('booking_email_regn_complete_text', $booking_email_regn_complete_text),
+    '#type' => $form_type,
+    '#format' => $form_format,     
   );	
   $form['emails']['booking_email_waitinglist_text'] = array(
     '#title' => t('Registration on Waiting List Email'),
     '#description' => t('Email text to indicate a person has registered but is on the waiting list. ' .
       'This will be sent instead of the Registration Successful or Registration Complete emails if the person is on the waiting list.'),
-    '#type' => 'textarea',
-    //'#format' => 'full_html',
-    '#default_value' => variable_get('booking_email_waitinglist_text', $booking_email_waitinglist_text),
+    '#default_value' => $form_type == 'text_format' ? variable_get('booking_email_waitinglist_text')['value'] : variable_get('booking_email_waitinglist_text', $booking_email_waitinglist_text),
+    '#type' => $form_type,
+    '#format' => $form_format,      
   );	
   $form['emails']['booking_email_partialpayment_received_text'] = array(
     '#title' => t('Email text to send a person thanking them for their partial payment'),