diff --git a/calendar/inc/class.boicalendar.inc.php b/calendar/inc/class.boicalendar.inc.php
index 697b48cf89..bcc90baeb5 100755
--- a/calendar/inc/class.boicalendar.inc.php
+++ b/calendar/inc/class.boicalendar.inc.php
@@ -2835,7 +2835,7 @@ class boicalendar
 					$so_event->add_attribute('owner',$GLOBALS['phpgw_info']['user']['account_id']);
 					$so_event->add_attribute('participants',$this->switch_to_phpgw_status($ical['organizer']['partstat']),$GLOBALS['phpgw_info']['user']['account_id']);
 				}
-				else
+				elseif(isset($ical['attendee']))
 				{
 					$attendee_count = count($ical['attendee']);
 
@@ -2847,6 +2847,11 @@ class boicalendar
 						}
 					}
 				}
+				else
+				{
+					$so_event->add_attribute('owner',$GLOBALS['phpgw_info']['user']['account_id']);
+					$so_event->add_attribute('participants',$this->switch_to_phpgw_status($ical['organizer']['partstat']),$GLOBALS['phpgw_info']['user']['account_id']);
+				}
 			}
 		}
 
@@ -3067,10 +3072,10 @@ class boicalendar
 //rrule
 					}
 				
-					if(!isset($ical['event'][$i]['organizer']))
+					if(!isset($ical['event'][$i]['organizer']) || (isset($ical['event'][$i]['organizer']) && $ical['event'][$i]['organizer']['cn'] == $GLOBALS['phpgw_info']['user']['account_lid']))
 					{
 						$so_event->add_attribute('owner',$GLOBALS['phpgw_info']['user']['account_id']);
-						$so_event->add_attribute('participants','A',$GLOBALS['phpgw_info']['user']['account_id']);
+						$so_event->add_attribute('participants','A',intval($GLOBALS['phpgw_info']['user']['account_id']));
 					}
 					else
 					{