diff --git a/calendar/day.php b/calendar/day.php
index aaa59e85a7..7072232f2b 100644
--- a/calendar/day.php
+++ b/calendar/day.php
@@ -68,7 +68,7 @@
 
   $view = "day";
 
-  $now	= $phpgw->calendar->splitdate(mktime (2, 0, 0, $thismonth, $thisday, $thisyear));
+  $now	= $phpgw->calendar->splitdate(mktime (0, 0, 0, $thismonth, $thisday, $thisyear) - ((60 * 60) * $phpgw_info["user"]["preferences"]["common"]["tz_offset"]));
 
   $phpgw->template->set_file(array("day_t" => "day.tpl"));
 
diff --git a/index.php b/index.php
index 5551d0e16d..8c6b70a80e 100755
--- a/index.php
+++ b/index.php
@@ -144,10 +144,12 @@
   if ($phpgw_info["user"]["apps"]["calendar"]
   && $phpgw_info["user"]["preferences"]["calendar"]["mainscreen_showevents"]) {
     echo "<!-- Calendar info -->\n";
+    $now = $phpgw->calendar->splitdate(mktime (0, 0, 0, $phpgw->calendar->today["month"], $phpgw->calendar->today["day"], $phpgw->calendar->today["year"]) - ((60 * 60) * $phpgw_info["user"]["preferences"]["common"]["tz_offset"]));
+
     echo "<table border=\"0\" width=\"70%\" cellspacing=\"0\" cellpadding=\"0\"><tr><td align=\"center\">"
 	. lang(date("F",$phpgw->calendar->today["raw"])) . " " .$phpgw->calendar->today["day"] . ", " . $phpgw->calendar->today["year"] ."</tr></td>"
         . "<tr><td bgcolor=\"".$phpgw_info["theme"]["bg_text"]."\" valign=\"top\">"
-	. $phpgw->calendar->print_day_at_a_glance($phpgw->calendar->today)."</td></tr></table>\n";
+	. $phpgw->calendar->print_day_at_a_glance($now)."</td></tr></table>\n";
     echo "<!-- Calendar info -->\n";
   }