diff --git a/booking.admin.inc b/booking.admin.inc
index ddca8df..31c8140 100644
--- a/booking.admin.inc
+++ b/booking.admin.inc
@@ -10,14 +10,6 @@ function booking_admin() {
   //regenerate all our menu hooks when loading this form
   menu_rebuild();
 
-  //dodgy hack for testing
-  variable_set('mail_system', array('default-system' => 'DefaultMailSystem', 'booking' => 'BookingMailSystem'));
-  /*
-  mailsystem_set(array(
-    'booking' => 'BookingMailSystem',
-  ));
-  */
-
   //create the mysql view booking_person_view if necessary
   try {
     $sqlview_check = db_query("SELECT * FROM {booking_person_view}")->fetchAssoc();
@@ -35,7 +27,7 @@ function booking_admin() {
 		'#collapsible' => TRUE,     
   );
 
-  $form['features']['booking_enable_html_mail'] = array(
+  $form['email']['booking_enable_html_mail'] = array(
     '#type' => 'radios',
     '#title' => t('Enable html emails?'),
     '#description' => t('Turn this feature on for html based emails, otherwise plaintext emails will be used. HTML based emails will require a custom template file to be defined.'),