diff --git a/kronolith/docs/CHANGES b/kronolith/docs/CHANGES
index dbddaf9338b..4e04bfc5a75 100644
--- a/kronolith/docs/CHANGES
+++ b/kronolith/docs/CHANGES
@@ -2,6 +2,8 @@
 v4.2.0-git
 ----------
 
+[jan] Use the event's or calendar's owner identity when sending notifications
+      (Bug #13158).
 
 
 ------------
diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
index 918af79b7dd..8faeeb0e783 100644
--- a/kronolith/lib/Kronolith.php
+++ b/kronolith/lib/Kronolith.php
@@ -2067,13 +2067,14 @@ static public function sendNotification($event, $action)
             throw new Kronolith_Exception($e);
         }
 
-        $senderIdentity = $injector->getInstance('Horde_Core_Factory_Identity')->create();
-
         $owner = $share->get('owner');
         if ($owner) {
             $recipients[$owner] = self::_notificationPref($owner, 'owner');
         }
 
+        $senderIdentity = $injector->getInstance('Horde_Core_Factory_Identity')
+            ->create($event->creator ?: $owner);
+
         foreach ($share->listUsers(Horde_Perms::READ) as $user) {
             if (!isset($recipients[$user])) {
                 $recipients[$user] = self::_notificationPref($user, 'read', $calendar);
diff --git a/kronolith/package.xml b/kronolith/package.xml
index a20524d82d6..c503998b872 100644
--- a/kronolith/package.xml
+++ b/kronolith/package.xml
@@ -33,7 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
-* 
+* [jan] Use the event&apos;s or calendar&apos;s owner identity when sending notifications (Bug #13158).
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -2326,7 +2326,7 @@
    <date>2014-05-05</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
-* 
+* [jan] Use the event&apos;s or calendar&apos;s owner identity when sending notifications (Bug #13158).
    </notes>
   </release>
  </changelog>