Index: branches/5.1.x/core/kernel/db/cat_event_handler.php
===================================================================
diff -u -N -r14007 -r14024
--- branches/5.1.x/core/kernel/db/cat_event_handler.php	(.../cat_event_handler.php)	(revision 14007)
+++ branches/5.1.x/core/kernel/db/cat_event_handler.php	(.../cat_event_handler.php)	(revision 14024)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: cat_event_handler.php 14007 2010-10-19 19:20:53Z alex $
+* @version	$Id: cat_event_handler.php 14024 2010-11-01 18:43:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -2442,19 +2442,21 @@
 
 		// send email events
 		$perm_prefix = $this->Application->getUnitOption($event->Prefix, 'PermItemPrefix');
+		$owner_field = $this->getOwnerField($event->Prefix);
+		$owner_id = $object->GetDBField($owner_field);
+
 		switch ($event->Name) {
 			case 'OnCreate':
 				$event_suffix = $is_active ? 'ADD' : 'ADD.PENDING';
-				$owner_field = $this->getOwnerField($event->Prefix);
-
 				$this->Application->EmailEventAdmin($perm_prefix.'.'.$event_suffix); // there are no ADD.PENDING event for admin :(
-				$this->Application->EmailEventUser($perm_prefix.'.'.$event_suffix, $object->GetDBField($owner_field));
+				$this->Application->EmailEventUser($perm_prefix.'.'.$event_suffix, $owner_id);
 				break;
 
 			case 'OnUpdate':
 				$event_suffix = $is_active ? 'MODIFY' : 'MODIFY.PENDING';
+				$user_id = is_numeric( $object->GetDBField('ModifiedById') ) ? $object->GetDBField('ModifiedById') : $owner_id;
 				$this->Application->EmailEventAdmin($perm_prefix.'.'.$event_suffix); // there are no ADD.PENDING event for admin :(
-				$this->Application->EmailEventUser($perm_prefix.'.'.$event_suffix, $object->GetDBField('ModifiedById'));
+				$this->Application->EmailEventUser($perm_prefix.'.'.$event_suffix, $user_id);
 				break;
 		}
 	}