diff --git a/calendar/js/navigation.js b/calendar/js/navigation.js
index 3f71ea8e78..8b2074877c 100644
--- a/calendar/js/navigation.js
+++ b/calendar/js/navigation.js
@@ -77,7 +77,7 @@
 	function dateChanged(calendar) {
 
 		if (calendar.dateClicked) {
-		egw_link_handler(link_day_url+"&date=" + calendar.date.print("%Y%m%d"),"calendar");
+			egw_link_handler(link_day_url+"&date=" + calendar.date.print("%Y%m%d"),"calendar");
 		}
 	}
 
@@ -87,7 +87,7 @@
 	 * @returns {undefined}
 	 */
 	function todayClicked(calendar) {
-		egw_link_handler(link_day_url+"&date="+ current_date ,"calendar");
+		egw_link_handler(current_view_url+"&date="+ current_date ,"calendar");
 	}
 
 	/*