diff --git a/date_views/includes/date_views_filter_handler_simple.inc b/date_views/includes/date_views_filter_handler_simple.inc
index 4e7bbb4..689b4b7 100644
--- a/date_views/includes/date_views_filter_handler_simple.inc
+++ b/date_views/includes/date_views_filter_handler_simple.inc
@@ -310,7 +310,6 @@ class date_views_filter_handler_simple extends views_handler_filter_date {
       $type = 'date_text';
     }
 
-    $format = $this->date_handler->views_formats($this->options['granularity'], 'sql');
     $granularity = array_keys($this->date_handler->date_parts($this->options['granularity']));
     $relative_value = ($prefix == 'max' ? $this->options['default_to_date'] : $this->options['default_date']);
 
@@ -323,7 +322,7 @@ class date_views_filter_handler_simple extends views_handler_filter_date {
         '#type' => $type,
         '#size' => 20,
         '#default_value' => !empty($this->value[$prefix]) ? $this->value[$prefix] : $default_date,
-        '#date_format' => date_limit_format($format, $granularity),
+        '#date_format' => date_limit_format(variable_get('date_format_short', 'm/d/Y - H:i'), $granularity),
         '#date_label_position' => 'within',
         '#date_year_range' => $this->options['year_range'],
         '#process' => array($type . '_element_process'),
@@ -358,7 +357,7 @@ class date_views_filter_handler_simple extends views_handler_filter_date {
         '#type' => $type,
         '#size' => 20,
         '#default_value' => !empty($this->value[$prefix]) ? $this->value[$prefix] : $default_date,
-        '#date_format' => date_limit_format($format, $granularity),
+        '#date_format' => date_limit_format($this->format, $granularity),
         '#date_label_position' => 'within',
         '#date_year_range' => $this->options['year_range'],
         '#process' => array($type . '_element_process'),