diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php
index c2abc2f61c..425edafa8c 100644
--- a/calendar/inc/class.calendar_so.inc.php
+++ b/calendar/inc/class.calendar_so.inc.php
@@ -1342,7 +1342,7 @@ ORDER BY cal_user_type, cal_usre_id
 	 * @param int &$etag etag=null etag to check or null, on return new etag
 	 * @return boolean|int false on error, 0 if etag does not match, cal_id otherwise
 	 */
-	function save($event,&$set_recurrences,&$set_recurrences_start=0,$change_since=0,&$etag=null)
+	function save(&$event,&$set_recurrences,&$set_recurrences_start=0,$change_since=0,&$etag=null)
 	{
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
 		{
@@ -1632,6 +1632,8 @@ ORDER BY cal_user_type, cal_usre_id
 			$this->participants($cal_id,$event['cal_participants'],!$cal_id ? false : $change_since);
 		}
 		// Custom fields
+		Api\Etemplate\Widget\Customfields::handle_files('calendar', $cal_id, $event);
+		
 		foreach($event as $name => $value)
 		{
 			if ($name[0] == '#')
diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index d07d8cfe10..df904f3ea0 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -1585,6 +1585,7 @@ class calendar_uiforms extends calendar_ui
 			}
 		}
 		$content = array_merge($event,array(
+			'cal_id'  => $event['id'],
 			'link_to' => array(
 				'to_id'  => $link_to_id,
 				'to_app' => 'calendar',