diff --git a/calendar/inc/class.uicalendar.inc.php b/calendar/inc/class.uicalendar.inc.php
index f371767d2c..78aba50afb 100755
--- a/calendar/inc/class.uicalendar.inc.php
+++ b/calendar/inc/class.uicalendar.inc.php
@@ -234,8 +234,9 @@
 
 			if (!$this->bo->printer_friendly)
 			{
+				unset($phpgw_info['flags']['noheader']);
+				unset($phpgw_info['flags']['nonavbar']);
 				$phpgw->common->phpgw_header();
-				echo parse_navbar();
 				$printer = '';
 				$param = '&year='.$this->bo->year.'&month='.$this->bo->month.'&friendly=1';
 				$print = '<a href="'.$this->page('month'.$param)."\" TARGET=\"cal_printer_friendly\" onMouseOver=\"window.status = '".lang('Generate printer-friendly version')."'\">[".lang('Printer Friendly').']</a>';
diff --git a/calendar/index.php b/calendar/index.php
index 30b24569a5..54b0be8ff1 100755
--- a/calendar/index.php
+++ b/calendar/index.php
@@ -27,14 +27,6 @@
 	
 	include('../header.inc.php');
 
-	$newpage = $phpgw_info['user']['preferences']['calendar']['defaultcalendar'];
-	if ($newpage=='index.php' || ($newpage != 'day.php' && $newpage != 'week.php' && $newpage != 'month.php' && $newpage != 'year.php'))
-	{
-		$newpage = 'month.php';
-		$phpgw->preferences->add('calendar','defaultcalendar','month.php');
-		$phpgw->preferences->save_repository();
-	}
-
-	Header('Location: '.$newpage.'?'.$QUERY_STRING);
+	Header('Location: '.$phpgw->link('/index.php','menuaction=calendar.uicalendar.index'));
 	$phpgw->common->phpgw_exit();
 ?>