diff --git a/include/class.forms.php b/include/class.forms.php
index f74f69789b69ef91306cd69c82e34b440db02a75..484be2059ad98083c614b24b2452d5fa587b1022 100644
--- a/include/class.forms.php
+++ b/include/class.forms.php
@@ -2415,14 +2415,15 @@ class DatetimeField extends FormField {
         case 'before':
             return new Q(array("{$name}__lt" => $value));
         case 'between':
-            $tz = new DateTimeZone($cfg->getTimezone());
-            $dbtz = new DateTimeZone($cfg->getDbTimezone());
             $left = Format::parseDateTime($value['left']);
             $right = Format::parseDateTime($value['right']);
+            // TODO: allow time selection for between
             $left = $left->setTime(00, 00, 00);
             $right = $right->setTime(23, 59, 59);
-            $left->setTimezone($tz)->setTimezone($dbtz);
-            $right->setTimezone($tz)->setTimezone($dbtz);
+            // Convert time to db timezone
+            $dbtz = new DateTimeZone($cfg->getDbTimezone());
+            $left->setTimezone($dbtz);
+            $right->setTimezone($dbtz);
             return new Q(array(
                 "{$name}__gte" =>  $left->format('Y-m-d H:i:s'),
                 "{$name}__lte" =>  $right->format('Y-m-d H:i:s'),