--- kronolith/lib/Driver/kolab.php.orig 2009-05-04 18:56:54.000000000 +0200                                                  
+++ kronolith/lib/Driver/kolab.php      2009-05-04 20:03:12.000000000 +0200                                                  
@@ -1438,7 +1438,14 @@                                                                                                       
             $this->setPrivate(true);                                                                                        
         }                                                                                                                   
                                                                                                                             
-        if (isset($event['organizer']['smtp-address'])) {                                                                   
+        if (isset($event['creator']['smtp-address'])) {                                                                     
+            if (Kronolith::isUserEmail(Auth::getAuth(), $event['creator']['smtp-address'])) {                               
+                $this->creatorID = Auth::getAuth();                                                                         
+            } else {                                                                                                        
+                $this->creatorID = $event['creator']['smtp-address'];                                                       
+            }                                                                                                               
+        }                                                                                                                   
+        elseif (isset($event['organizer']['smtp-address'])) {                                                               
             if (Kronolith::isUserEmail(Auth::getAuth(), $event['organizer']['smtp-address'])) {                             
                 $this->creatorID = Auth::getAuth();                                                                         
             } else {
@@ -1549,13 +1556,14 @@
             $event['sensitivity'] = 'public';
         }

-        // Only set organizer if this is a new event
+        // Only set creator and organizer if this is a new event
         if ($this->getID() == null) {
             $organizer = array(
                             'display-name' => Kronolith::getUserName($this->getCreatorId()),
                             'smtp-address' => Kronolith::getUserEmail($this->getCreatorId())
                          );
             $event['organizer'] = $organizer;
+            $event['creator'] = $organizer;
         }

         if ($this->alarm != 0) {
--- lib/Horde/Kolab/Format/XML/event.php.orig   2009-05-04 20:07:33.000000000 +0200
+++ lib/Horde/Kolab/Format/XML/event.php        2009-05-04 19:37:42.000000000 +0200
@@ -52,6 +52,7 @@
                 'value'   => HORDE_KOLAB_XML_VALUE_MAYBE_MISSING,
             ),
             'organizer' => $this->_fields_simple_person,
+            'creator' => $this->_fields_simple_person,
             'start-date' => array(
                 'type'    => HORDE_KOLAB_XML_TYPE_STRING,
                 'value'   => HORDE_KOLAB_XML_VALUE_NOT_EMPTY,