diff --git a/booking.admin.inc b/booking.admin.inc
index 90afd6b..bd10f9a 100644
--- a/booking.admin.inc
+++ b/booking.admin.inc
@@ -11,9 +11,12 @@ function booking_admin() {
   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 {
diff --git a/booking.install b/booking.install
index d9a4170..186adda 100644
--- a/booking.install
+++ b/booking.install
@@ -695,6 +695,7 @@ function booking_uninstall() {
   */
 function booking_enable() {
 	drupal_set_message($message = t('The Booking System module was successfully enabled.'), $type = 'status');
+	variable_set('mail_system', array('default-system' => 'DefaultMailSystem', 'booking' => 'BookingMailSystem'));
 	//let MIME Mail know that we can send html emails
 	mailsystem_set(array(
     'booking' => 'BookingMailSystem',
@@ -706,6 +707,7 @@ function booking_enable() {
   */
 function booking_disable() {
 	drupal_set_message($message = t('The Booking System module was successfully disabled.'), $type = 'status');
+	variable_set('mail_system', array('default-system' => 'DefaultMailSystem'));
 	//clean up our entry about mailsystems
 	mailsystem_clear(array(
     'booking' => 'BookingMailSystem',