diff --git a/date_repeat/date_repeat_form.inc b/date_repeat/date_repeat_form.inc
index 76023d7..44a4a0e 100644
--- a/date_repeat/date_repeat_form.inc
+++ b/date_repeat/date_repeat_form.inc
@@ -64,7 +64,6 @@ function _date_repeat_rrule_process($element, &$form_state, $form) {
 
   $parts = date_repeat_split_rrule($rrule);
   $rrule = $parts[0];
-
   $exceptions = $parts[1];
   $additions = $parts[2];
   $timezone = !empty($element['#date_timezone']) ? $element['#date_timezone'] : date_default_timezone();
@@ -680,7 +679,7 @@ function _date_repeat_rrule_process($element, &$form_state, $form) {
         '#default_value' => $r_date,
         '#date_timezone' => !empty($element['#date_timezone']) ?
         $element['#date_timezone'] : date_default_timezone(),
-        '#date_format' => $date_format,
+        '#date_format' => !empty($element['#date_format']) ? date_limit_format($element['#date_format'], array('year', 'month', 'day', 'hour', 'minute')) : 'Y-m-d H:i',
         '#date_text_parts'  => !empty($element['#date_text_parts']) ? $element['#date_text_parts'] : array(),
         '#date_year_range'  => !empty($element['#date_year_range']) ? $element['#date_year_range'] : '-3:+3',
         '#date_label_position' => !empty($element['#date_label_position']) ? $element['#date_label_position'] : 'within',
@@ -692,11 +691,11 @@ function _date_repeat_rrule_process($element, &$form_state, $form) {
       ),
       'all_day' => array(
         '#type' => 'hidden',
-        '#value' => 1,
+        '#value' => 0,
       ),
       'granularity' => array(
         '#type' => 'hidden',
-        '#value' => serialize(array('year', 'month', 'day')),
+        '#value' => serialize(array('year', 'month', 'day', 'hour', 'minute')),
       ),
     );
   }
@@ -954,7 +953,7 @@ function date_repeat_merge($form_values, $element) {
     }
     foreach ($form_values['RDATE'] as $delta => $value) {
       if (is_array($value['datetime'])) {
-        $rdate_element['#date_format'] = $date_format;
+        $rdate_element['#date_format'] = !empty($element['#date_format']) ? date_limit_format($element['#date_format'], array('year', 'month', 'day', 'hour', 'minute')) : 'Y-m-d H:i';
         $date = $function($rdate_element, $form_values['RDATE'][$delta]['datetime']);
         $form_values['RDATE'][$delta]['datetime'] = is_object($date) ? $date->format(DATE_FORMAT_DATETIME) : '';
       }
diff --git a/date_repeat_field/date_repeat_field.module b/date_repeat_field/date_repeat_field.module
index d4d4c90..3ffe386 100644
--- a/date_repeat_field/date_repeat_field.module
+++ b/date_repeat_field/date_repeat_field.module
@@ -491,7 +491,7 @@ function date_repeat_build_dates($rrule = NULL, $rrule_values = NULL, $field, $i
   $additions = array();
   foreach ($parsed_rdates as $rdate) {
     $date = date_ical_date($rdate, $timezone);
-    $additions[] = date_format($date, 'Y-m-d');
+    $additions[] = date_format($date, 'Y-m-d H:i');
   }
 
   $dates = date_repeat_calc($rrule, $start_datetime, $end_datetime, $exceptions, $timezone, $additions);