diff --git a/calendar/preferences.php b/calendar/preferences.php
index dd75eca8de..5fff0cded9 100644
--- a/calendar/preferences.php
+++ b/calendar/preferences.php
@@ -23,6 +23,7 @@
      $phpgw->preferences->preferences_add($phpgw_info["user"]["account_id"],"weekdaystarts","calendar");
      $phpgw->preferences->preferences_add($phpgw_info["user"]["account_id"],"workdaystarts","calendar");
      $phpgw->preferences->preferences_add($phpgw_info["user"]["account_id"],"workdayends","calendar");
+     $phpgw->preferences->preferences_add($phpgw_info["user"]["account_id"],"defaultcalendar","common");
      if ($mainscreen_showevents) {
         $phpgw->preferences->preferences_add($phpgw_info["user"]["account_id"],"mainscreen_showevents","calendar");
      }
@@ -99,6 +100,25 @@
     </select>
    </td>
   </tr>
+  <?php
+    $tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
+  ?>
+  <tr bgcolor="<?php echo $tr_color; ?>">
+   <td><?php echo lang("default calendar view"); ?></td>
+   <td align="center">
+    <select name="defaultcalendar">
+     <option value="year.php"<?php if($phpgw_info["user"]["preferences"]["common"]["defaultcalendar"] == "year.php") " selected"; ?>>Yearly</option>
+<?php
+   echo "<option value=\"index.php\"";
+   if(!isset($phpgw_info["user"]["preferences"]["common"]["defaultcalendar"]) || $phpgw_info["user"]["preferences"]["common"]["defaultcalendar"] == "index.php")
+     echo " selected";
+   echo ">Monthly</option>";
+?>
+     <option value="week.php"<?php if($phpgw_info["user"]["preferences"]["common"]["defaultcalendar"] == "week.php") " selected"; ?>>Weekly</option>
+     <option value="day.php"<?php if($phpgw_info["user"]["preferences"]["common"]["defaultcalendar"] == "day.php") " selected"; ?>>Daily</option>
+    </select>
+   </td>
+  </tr>
   <tr><td align="center"><input type="submit" name="submit" value="<?php echo lang("submit"); ?>"></td></tr>
  </table>
 </form>
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index b07b9e3270..d81c002a94 100755
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -33,6 +33,7 @@
 	- Fixed problem with moving to prev/next msg in NNTP.
 	- Fix possible problem connecting to LDAP server.
 	- Fix home page display of calendar events.
+	- Added ability to set users defaut calendar view of top icon.
         
 [0.9.6] - Fix user permissions where not being checked properly.