diff --git a/calendar/inc/hook_calendar_add_def_pref.inc.php b/calendar/inc/hook_calendar_add_def_pref.inc.php
index cb35b6ac0a..247aa9e91b 100755
--- a/calendar/inc/hook_calendar_add_def_pref.inc.php
+++ b/calendar/inc/hook_calendar_add_def_pref.inc.php
@@ -16,7 +16,7 @@
   $pref->change("calendar","weekstarts","Monday");
   $pref->change("calendar","workdaystarts","9");
   $pref->change("calendar","workdayends","17");
-  $pref->change("calendar","defaultcalendar","index.php");
+  $pref->change("calendar","defaultcalendar","month.php");
   $pref->change("calendar","defaultfilter","all");
   $pref->change("calendar","mainscreen_showevents","Y");
 ?>
diff --git a/calendar/index.php b/calendar/index.php
index 1a41ab157e..e0cb8d7150 100755
--- a/calendar/index.php
+++ b/calendar/index.php
@@ -22,6 +22,9 @@
   $phpgw_info["flags"]["nofooter"] = True;
   include("../header.inc.php");
 
-  Header("Location: ".$phpgw_info["user"]["preferences"]["calendar"]["defaultcalendar"]."?".$QUERY_STRING);
+  $newpage = $phpgw_info["user"]["preferences"]["calendar"]["defaultcalendar"];
+  if ($namepage=="index.php") $newpage = "month.php";
+
+  Header("Location: ".$newpage."?".$QUERY_STRING);
   $phpgw->common->phpgw_exit();
 ?>
diff --git a/calendar/preferences.php b/calendar/preferences.php
index f3dc1a69eb..597c006bd0 100644
--- a/calendar/preferences.php
+++ b/calendar/preferences.php
@@ -115,7 +115,7 @@
        }
      ?>
      <option value="year.php"<?php echo $selected["year.php"] . ">" . lang("Yearly"); ?></option>
-     <option value="index.php"<?php echo $selected["month.php"] . ">" . lang("Monthly"); ?></option>
+     <option value="month.php"<?php echo $selected["month.php"] . ">" . lang("Monthly"); ?></option>
      <option value="week.php"<?php echo $selected["week.php"]  . ">" . lang("Weekly"); ?></option>
      <option value="day.php"<?php echo $selected["day.php"] . ">" . lang("Daily"); ?></option>
     </select>