diff --git a/hotel_booking/hotel_booking.calendars.inc b/hotel_booking/hotel_booking.calendars.inc
index 3c3456f..425ac83 100644
--- a/hotel_booking/hotel_booking.calendars.inc
+++ b/hotel_booking/hotel_booking.calendars.inc
@@ -335,7 +335,7 @@ function hotel_booking_calendars_node($node, $year = FALSE, $month = FALSE, $sho
   $res = db_query($query, $params);
 
   //prepopulate the results so something shows if no availability or rates
-  $ref_dt = new DateObject($start_date, date_default_timezone(), DATE_FORMAT_ISO);
+  $ref_dt = new DateObject($start_date, date_default_timezone(), DATE_FORMAT_DATE);
   while ($ref_dt->format('U') <= $end_time) {
     $results[$ref_dt->format('Y')][$ref_dt->format('n')] = array();
     $ref_dt->modify('+1 months');
diff --git a/hotel_booking/hotel_booking.module b/hotel_booking/hotel_booking.module
index 6524fab..803bc06 100644
--- a/hotel_booking/hotel_booking.module
+++ b/hotel_booking/hotel_booking.module
@@ -676,7 +676,7 @@ function hotel_booking_search_results($values) {
   }
   else {
     $check_in = $check_in_date;
-    $check_in_date = new DateObject($check_in, date_default_timezone(), DATE_FORMAT_ISO);
+    $check_in_date = new DateObject($check_in, date_default_timezone(), DATE_FORMAT_DATE);
   }
   $nights = $values['nights'];
   $adults = $values['adults'];
diff --git a/hotel_booking/hotel_booking.util.inc b/hotel_booking/hotel_booking.util.inc
index 1640e93..158b714 100644
--- a/hotel_booking/hotel_booking.util.inc
+++ b/hotel_booking/hotel_booking.util.inc
@@ -198,7 +198,7 @@ function hotel_booking_defaults($form_state) {
     if ($user->uid && isset($user->hotel_booking_details)) { //user is logged in and has defaults
       //get defaults
       $defaults = $user->hotel_booking_details;
-      $date = new DateObject($defaults['check_in'], date_default_timezone(), DATE_FORMAT_ISO);
+      $date = new DateObject($defaults['check_in'], date_default_timezone(), DATE_FORMAT_DATE);
       if (!$date || (int)$date->format('U') < REQUEST_TIME) {
         $today = date_now();
         $date = new DateObject('now', date_default_timezone(), DATE_FORMAT_ISO); //todays date
@@ -252,7 +252,7 @@ function hotel_booking_save_defaults($form_state) {
   else {
     $defaults['smoking'] = 0;
   }
-  $date = new DateObject($form_state['values']['check_in'], date_default_timezone(), DATE_FORMAT_ISO);
+  $date = new DateObject($form_state['values']['check_in'], date_default_timezone(), DATE_FORMAT_DATE);
   $defaults['check_in'] = $form_state['values']['check_in'];
 
   global $user;
@@ -412,8 +412,8 @@ function hotel_booking_calculate_prices($check_in, $check_out, $rooms,
   }
   $dates = $results = array();
   //cache caldates
-  $start_date = new DateObject($check_in, date_default_timezone(), DATE_FORMAT_ISO);
-  $end_date = new DateObject($check_out, date_default_timezone(), DATE_FORMAT_ISO);
+  $start_date = new DateObject($check_in, date_default_timezone(), DATE_FORMAT_DATE);
+  $end_date = new DateObject($check_out, date_default_timezone(), DATE_FORMAT_DATETIME);
   $query = "SELECT r.calendar_dt, r.rate, hbrt.nid
             FROM {hotel_booking_room_types} hbrt
             INNER JOIN {node} n
@@ -479,7 +479,7 @@ function hotel_booking_calculate_prices($check_in, $check_out, $rooms,
 */
 function hotel_booking_calculate_checkout($check_in, $nights, $last_night = FALSE) {
 
-  $last_dt = new DateObject($check_in, date_default_timezone(), DATE_FORMAT_ISO);
+  $last_dt = new DateObject($check_in, date_default_timezone(), DATE_FORMAT_DATE);
   $last_dt->modify('+'. ($nights - 1) .' days');
   if ($last_night) {
     return $lastnight->format(DATE_FORMAT_DATETIME);