Index: trunk/kernel/units/email_events/email_events_event_handler.php
===================================================================
diff -u -N -r6093 -r6428
--- trunk/kernel/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 6093)
+++ trunk/kernel/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 6428)
@@ -124,7 +124,7 @@
 			$message_object = &$this->Application->recallObject('emailmessages', null, Array('skip_autoload' => true));
 			$event_table = $this->Application->getUnitOption('emailevents', 'TableName');
 
-			$event_object = &$event->getObject();
+			$event_object =& $event->getObject( Array('skip_autoload' => true) );
 			$event_object->Load(array('Event'=>$email_event, 'Type'=>$email_event_type));
 
 			$event_id 		= $event_object->GetDBField('EventId');
@@ -165,7 +165,7 @@
 			$message_template = $message_object->GetDBField('Template')."\r\n".$footer;
 			// add footer: end
 
-			$from_user_object = &$this->Application->recallObject('u.-email'.$from_user_id, null, Array('skip_autoload' => true));
+			$from_user_object = &$this->Application->recallObject('u.email-from', null, Array('skip_autoload' => true));
 			$from_user_object->Load($from_user_id);
 			// here if we don't have from_user loaded, it takes a default user from config values
 			if ( $from_user_object->IsLoaded() ) {
@@ -176,7 +176,7 @@
 				$from_user_email = $this->Application->ConfigValue('Smtp_AdminMailFrom');
 			}
 
-			$to_user_object = &$this->Application->recallObject('u.-email'.$to_user_id, null, Array('skip_autoload' => true));
+			$to_user_object = &$this->Application->recallObject('u.email-to', null, Array('skip_autoload' => true));
 			$to_user_object->Load($to_user_id);
 			$to_user_email = $to_user_object->GetDBField('Email');
 			$to_user_name = trim($to_user_object->GetDBField('FirstName').' '.$to_user_object->GetDBField('LastName'));
@@ -263,6 +263,8 @@
 				$this->Conn->Query($sql);
 			}
 
+			$this->Application->removeObject('u.email-from');
+			$this->Application->removeObject('u.email-to');
 			return $event;
 		}
 	}