diff --git a/booking.regn_form.inc b/booking.regn_form.inc
index 587a2a6..2733b37 100644
--- a/booking.regn_form.inc
+++ b/booking.regn_form.inc
@@ -1430,6 +1430,8 @@ function _booking_form_submit_post_triggers($node)
     }
   }
   
+  //@todo repeat the process above for bf/gf
+  
   //check whether we should send an automatic email even though they haven't paid yet
   if (variable_get('booking_auto_confirm_email', 0) == 1) {
     //send the person an email
diff --git a/booking.travel.inc b/booking.travel.inc
index f56be4e..0ad5eed 100644
--- a/booking.travel.inc
+++ b/booking.travel.inc
@@ -685,8 +685,7 @@ function travel_view($node, $view_mode)
   );
   $rows[] = array(
     t('Flight Arrival:'),
-    t('!date', array(
-      '!date' => format_date($node->booking_flight_datetime_inbound, 'custom', 'd/m/Y H:i')
+    t('!date', array('!date' => $node->booking_flight_datetime_inbound == 0 ? '' : format_date($node->booking_flight_datetime_inbound, 'custom', 'd/m/Y H:i')
     ))
   );
   $rows[] = array(
@@ -695,8 +694,7 @@ function travel_view($node, $view_mode)
   );
   $rows[] = array(
     t('Flight Departure:'),
-    t('!date', array(
-      '!date' => format_date($node->booking_flight_datetime_outbound, 'custom', 'd/m/Y H:i')
+    t('!date', array('!date' => $node->booking_flight_datetime_outbound == 0 ? '' : format_date($node->booking_flight_datetime_outbound, 'custom', 'd/m/Y H:i')
     ))
   );
   $rows[] = array(