diff --git a/phpgwapi/templates/justweb/head.inc.php b/phpgwapi/templates/justweb/head.inc.php
index 80bd8047c8..e8267ec2c9 100644
--- a/phpgwapi/templates/justweb/head.inc.php
+++ b/phpgwapi/templates/justweb/head.inc.php
@@ -40,8 +40,8 @@
 		'appt'			=> $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.uicalendar.day')),
 		'todo'			=> $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'todo.uitodo.add')),
 		'prefs'			=> $GLOBALS['phpgw']->link('/preferences/index.php'),
-		'email'			=> $GLOBALS['phpgw']->link('/email/preferences.php'),
-		'calendar'		=> $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calender.uicalendar.preferences')),
+		'email'		=> $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'email.uipreferences.preferences')),
+		'calendar'	=> $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.uipreferences.preferences')),
 		'addressbook'	=> $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'addressbook.uiaddressbook.preferences')),
 		'charset'		=> lang('charset'),
 		'font_family'	=> $GLOBALS['phpgw_info']['theme']['font'],