diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php
index 658add7863..d06c99bdbd 100644
--- a/calendar/inc/class.calendar_groupdav.inc.php
+++ b/calendar/inc/class.calendar_groupdav.inc.php
@@ -772,8 +772,8 @@ class calendar_groupdav extends groupdav_handler
 	{
 		// calendar description
 		$props[] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-description',$displayname);
-		// BOX URLs of the current user
 		/*
+		// BOX URLs of the current user
 		$props[] =	HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'schedule-inbox-URL',
 			array(HTTP_WebDAV_Server::mkprop(self::DAV,'href',$base_uri.'/calendar/')));
 		$props[] =	HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'schedule-outbox-URL',
diff --git a/phpgwapi/inc/class.groupdav.inc.php b/phpgwapi/inc/class.groupdav.inc.php
index 8b9ac0da03..3d176fbc50 100644
--- a/phpgwapi/inc/class.groupdav.inc.php
+++ b/phpgwapi/inc/class.groupdav.inc.php
@@ -375,11 +375,9 @@ class groupdav extends HTTP_WebDAV_Server
 		$props = array(
 			self::mkprop('current-user-principal',array(self::mkprop('href',$this->principalURL))),
 			self::mkprop('owner',array(self::mkprop('href',$this->base_uri.'/principals/users/'.$account_lid.'/'))),
-			self::mkprop('principal-URL',array(self::mkprop('href',$this->principalURL))),
+			//self::mkprop('principal-URL',array(self::mkprop('href',$this->principalURL))),
 			self::mkprop('alternate-URI-set',array(
 				self::mkprop('href','MAILTO:'.$GLOBALS['egw_info']['user']['email']))),
-			self::mkprop(groupdav::CALDAV,'calendar-user-address-set',array(
-						self::mkprop('href','MAILTO:'.$GLOBALS['egw_info']['user']['email']))),
 			self::mkprop('principal-collection-set',array(
 				self::mkprop('href',$this->base_uri.'/principals/users/'),
 				self::mkprop('href',$this->base_uri.'/principals/groups/'),
@@ -388,6 +386,10 @@ class groupdav extends HTTP_WebDAV_Server
 
 		switch ($app)
 		{
+			case 'calendar':
+				$props[] = self::mkprop(groupdav::CALDAV,'calendar-home-set',array(
+					self::mkprop('href',$this->base_uri.$path.'calendar/')));
+				break;
 			case 'infolog':
 				$props[] = self::mkprop(groupdav::CALDAV,'calendar-home-set',array(
 					self::mkprop('href',$this->base_uri.$path.'infolog/')));