diff --git a/profiles/dvg/modules/dvg/webform_appointment/webform_appointment.module b/profiles/dvg/modules/dvg/webform_appointment/webform_appointment.module
index 8b34688..82600e9 100644
--- a/profiles/dvg/modules/dvg/webform_appointment/webform_appointment.module
+++ b/profiles/dvg/modules/dvg/webform_appointment/webform_appointment.module
@@ -827,6 +827,7 @@ function webform_appointment_date_time_element_process($element, &$form_state, $
   ksort($dates);
 
   $full_date = $element['slots'] = array();
+  $timezone = new DateTimeZone($client_api->get_timezone() ? $client_api->get_timezone() : drupal_get_user_timezone());
   foreach ($dates as $date => $time_array) {
     $unix_date = strtotime($date);
     $morning_time = array();
@@ -839,21 +840,18 @@ function webform_appointment_date_time_element_process($element, &$form_state, $
     foreach ($time_array as $time) {
       $unix_time = strtotime($time);
 
-      $timezone = new DateTimeZone($client_api->get_timezone() ? $client_api->get_timezone() : drupal_get_user_timezone());
-      $date = new DateTime('1970-01-01 12:00', $timezone);
-      $midday = $date->getTimestamp();
-
-      $date = new DateTime('1970-01-01 17:00', $timezone);
-      $evening = $date->getTimestamp();
+      $datetime = new DateTime($time, $timezone);
+      $hour = (int) $datetime->format('H');
 
       $index = $unix_time;
       if ($unix_time < $unix_date) {
         $index += $unix_date;
       }
-      if ($unix_time < $midday) {
+
+      if ($hour < 12) {
         $morning_time[$index] = webform_appointment_format_date($unix_time, 'time');
       }
-      elseif ($unix_time < $evening) {
+      elseif ($hour < 17) {
         $midday_time[$index] = webform_appointment_format_date($unix_time, 'time');
       }
       else {