diff --git a/calendar/inc/class.calendar_ui.inc.php b/calendar/inc/class.calendar_ui.inc.php
index 45eab2d6b0..43b1f4aa32 100644
--- a/calendar/inc/class.calendar_ui.inc.php
+++ b/calendar/inc/class.calendar_ui.inc.php
@@ -787,7 +787,7 @@ class calendar_ui
 		$event['non_blocking'] = (bool)$event['non_blocking'];
 
 		$matches = null;
-		if(!(int)$event['id'] && preg_match('/^([a-z_-]+)([0-9]+)$/i',$event['id'],$matches))
+		if(!(int)$event['id'] && preg_match('/^([a-z_-]+)([0-9]+)([:-].+)?$/i', $event['id'], $matches))
 		{
 			$app = $matches[1];
 			$app_id = $matches[2];
diff --git a/calendar/inc/class.calendar_uilist.inc.php b/calendar/inc/class.calendar_uilist.inc.php
index b2e3952f39..aab5d15171 100644
--- a/calendar/inc/class.calendar_uilist.inc.php
+++ b/calendar/inc/class.calendar_uilist.inc.php
@@ -456,7 +456,7 @@ class calendar_uilist extends calendar_ui
 			}
 
 			$matches = null;
-			if(!(int)$event['id'] && preg_match('/^([a-z_-]+)([0-9]+)$/i',$event['id'],$matches))
+			if(!(int)$event['id'] && preg_match('/^([a-z_-]+)([0-9]+)([:-].+)?$/i', $event['id'], $matches))
 			{
 				$app = $matches[1];
 				$app_id = $matches[2];
@@ -474,14 +474,14 @@ class calendar_uilist extends calendar_ui
 			else
 			{
 				$is_private = !$this->bo->check_perms(Acl::READ,$event);
+				$event['app'] = 'calendar';
+				$event['app_id'] = $event['id'];
 			}
 			if ($is_private)
 			{
 				$event['class'] .= 'rowNoView ';
 			}
 
-			$event['app'] = 'calendar';
-			$event['app_id'] = $event['id'];
 
 			// Edit link
 			if($app && $app_id)