diff --git a/dvg_appointments.module b/dvg_appointments.module
index c904295..ff10d51 100644
--- a/dvg_appointments.module
+++ b/dvg_appointments.module
@@ -38,8 +38,8 @@ function dvg_appointments_menu() {
  * Implements hook_module_implements_alter().
  */
 function dvg_appointments_module_implements_alter(&$implementations, $hook) {
-  _dvg_global_module_implements_first('dvg_appointments', array('webform_submission_presave'), $implementations, $hook);
-  _dvg_global_module_implements_last('dvg_appointments', array('webform_submission_load', 'form_alter'), $implementations, $hook);
+  _dvg_global_module_implements_first('dvg_appointments', array('webform_submission_presave', 'webform_submission_load'), $implementations, $hook);
+  _dvg_global_module_implements_last('dvg_appointments', array('form_alter'), $implementations, $hook);
 }
 
 /**
@@ -358,6 +358,10 @@ function _webform_display_wa_product($component, $values, $format = 'html') {
   $products = $client->get_available_products();
   $display = array();
   foreach ($values as $value) {
+    if (!is_array($value)) {
+      continue;
+    }
+
     $product = $products[$value['product']];
     if ($format == 'html') {
       $display_value = theme('table', array(
@@ -403,7 +407,7 @@ function _webform_display_wa_date_time($component, $value, $format = 'html') {
     '#post_render' => array('webform_element_wrapper'),
     '#component' => $component,
     '#format' => $format,
-    '#value' => isset($value[0]) ? dvg_appointments_format_date($value[0], 'Y-m-d G:i:s') : '',
+    '#value' => isset($value[0]) ? dvg_appointments_format_date($value[0], 'day_date_time') : '',
   );
 }
 
@@ -849,6 +853,9 @@ function dvg_appointments_format_date($time, $type, $format = '') {
     case 'day_date':
       $date_formatted = format_date($time, 'custom', 'l, j F Y', $api_client->get_timezone());
       break;
+    case 'day_date_time':
+      $date_formatted = format_date($time, 'custom', 'l, j F Y H:i', $api_client->get_timezone());
+      break;
     case 'year':
       $date_formatted = format_date($time, 'custom', 'Y', $api_client->get_timezone());
       break;