Index: trunk/kernel/units/email_events/email_events_event_handler.php
===================================================================
diff -u -N -r2070 -r2106
--- trunk/kernel/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 2070)
+++ trunk/kernel/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 2106)
@@ -136,7 +136,8 @@
 			$parser_params = $this->Application->Parser->Params;
 			$direct_send_params['message_text'] = $message_body_additional;
 			$this->Application->Parser->Params = array_merge_recursive2($this->Application->Parser->Params, $direct_send_params);
-			$message_template = $this->Application->Parser->Parse($message_template, '', 0);
+			$message_template = str_replace('<inp:touser _Field', '<inp2:u_Field name', $message_template);
+			$message_template = $this->Application->Parser->Parse($message_template, 'email_template', 0);
 			$this->Application->Parser->Params = $parser_params;
 			
 			$message_template 	= str_replace("\r", "", $message_template);			
Index: trunk/kernel/units/users/users_event_handler.php
===================================================================
diff -u -N -r2082 -r2106
--- trunk/kernel/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 2082)
+++ trunk/kernel/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 2106)
@@ -163,6 +163,26 @@
 			
 			parent::OnCreate($event);
 			
+			$object =& $event->getObject();
+			
+			$this->Application->SetVar('u_id', $object->getID() );
+			
+			
+			
+			$this->Application->setUnitOption('u', 'AutoLoad', true);
+			
+			
+			switch ($object->GetDBField('Status')){
+				case 1:
+						$this->Application->EmailEventAdmin('USER.ADD', $object->GetID());
+						$this->Application->EmailEventUser('USER.ADD', $object->GetID());						
+					break;
+				case 2:
+						$this->Application->EmailEventAdmin('USER.ADD.PENDING', $object->GetID());
+						$this->Application->EmailEventUser('USER.ADD.PENDING', $object->GetID());
+					break;					
+			}
+			
 			$this->setNextTemplate($event);
 			
 			if( !$this->Application->IsAdmin() && ($event->status == erSUCCESS) && $event->redirect)
@@ -412,7 +432,9 @@
 			
 			$group_id = $this->Application->ConfigValue('User_SubscriberGroup');
 			$sql = 'INSERT INTO '.TABLE_PREFIX.'UserGroup(PortalUserId,GroupId,PrimaryGroup) VALUES (%s,%s,'.$is_primary.')';
-			$this->Conn->Query( sprintf($sql, $user_id, $group_id) );				
+			$this->Conn->Query( sprintf($sql, $user_id, $group_id) );
+			$this->Application->EmailEventAdmin('USER.SUBSCRIBE', $user_id);
+			$this->Application->EmailEventUser('USER.SUBSCRIBE', $user_id);
 			
 		}
 		
@@ -421,6 +443,8 @@
 			$group_id = $this->Application->ConfigValue('User_SubscriberGroup');
 			$sql = 'DELETE FROM '.TABLE_PREFIX.'UserGroup WHERE PortalUserId='.$user_id.' AND GroupId='.$this->Application->ConfigValue('User_SubscriberGroup');
 			$this->Conn->Query($sql);
+			$this->Application->EmailEventAdmin('USER.UNSUBSCRIBE', $user_id);
+			$this->Application->EmailEventUser('USER.UNSUBSCRIBE', $user_id);
 			
 		}		
 		
Index: trunk/core/units/email_events/email_events_event_handler.php
===================================================================
diff -u -N -r2070 -r2106
--- trunk/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 2070)
+++ trunk/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 2106)
@@ -136,7 +136,8 @@
 			$parser_params = $this->Application->Parser->Params;
 			$direct_send_params['message_text'] = $message_body_additional;
 			$this->Application->Parser->Params = array_merge_recursive2($this->Application->Parser->Params, $direct_send_params);
-			$message_template = $this->Application->Parser->Parse($message_template, '', 0);
+			$message_template = str_replace('<inp:touser _Field', '<inp2:u_Field name', $message_template);
+			$message_template = $this->Application->Parser->Parse($message_template, 'email_template', 0);
 			$this->Application->Parser->Params = $parser_params;
 			
 			$message_template 	= str_replace("\r", "", $message_template);			
Index: trunk/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r2082 -r2106
--- trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 2082)
+++ trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 2106)
@@ -163,6 +163,26 @@
 			
 			parent::OnCreate($event);
 			
+			$object =& $event->getObject();
+			
+			$this->Application->SetVar('u_id', $object->getID() );
+			
+			
+			
+			$this->Application->setUnitOption('u', 'AutoLoad', true);
+			
+			
+			switch ($object->GetDBField('Status')){
+				case 1:
+						$this->Application->EmailEventAdmin('USER.ADD', $object->GetID());
+						$this->Application->EmailEventUser('USER.ADD', $object->GetID());						
+					break;
+				case 2:
+						$this->Application->EmailEventAdmin('USER.ADD.PENDING', $object->GetID());
+						$this->Application->EmailEventUser('USER.ADD.PENDING', $object->GetID());
+					break;					
+			}
+			
 			$this->setNextTemplate($event);
 			
 			if( !$this->Application->IsAdmin() && ($event->status == erSUCCESS) && $event->redirect)
@@ -412,7 +432,9 @@
 			
 			$group_id = $this->Application->ConfigValue('User_SubscriberGroup');
 			$sql = 'INSERT INTO '.TABLE_PREFIX.'UserGroup(PortalUserId,GroupId,PrimaryGroup) VALUES (%s,%s,'.$is_primary.')';
-			$this->Conn->Query( sprintf($sql, $user_id, $group_id) );				
+			$this->Conn->Query( sprintf($sql, $user_id, $group_id) );
+			$this->Application->EmailEventAdmin('USER.SUBSCRIBE', $user_id);
+			$this->Application->EmailEventUser('USER.SUBSCRIBE', $user_id);
 			
 		}
 		
@@ -421,6 +443,8 @@
 			$group_id = $this->Application->ConfigValue('User_SubscriberGroup');
 			$sql = 'DELETE FROM '.TABLE_PREFIX.'UserGroup WHERE PortalUserId='.$user_id.' AND GroupId='.$this->Application->ConfigValue('User_SubscriberGroup');
 			$this->Conn->Query($sql);
+			$this->Application->EmailEventAdmin('USER.UNSUBSCRIBE', $user_id);
+			$this->Application->EmailEventUser('USER.UNSUBSCRIBE', $user_id);
 			
 		}		
 		
Index: trunk/core/units/email_events/email_events_config.php
===================================================================
diff -u -N -r1566 -r2106
--- trunk/core/units/email_events/email_events_config.php	(.../email_events_config.php)	(revision 1566)
+++ trunk/core/units/email_events/email_events_config.php	(.../email_events_config.php)	(revision 2106)
@@ -75,6 +75,7 @@
 																	'Fields' => Array(
 																			'Description' 	=> Array( 'title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td'),
 																			'Module' => Array( 'title'=>'la_col_Module' ),
+																			'Event' 	=> Array( 'title'=>'la_col_Event' ),
 																			'Type' 	=> Array( 'title'=>'la_col_Type' ),
 																			'Enabled' 	=> Array( 'title'=>'la_col_Status' ),
 																		),
Index: trunk/kernel/units/email_events/email_events_config.php
===================================================================
diff -u -N -r1566 -r2106
--- trunk/kernel/units/email_events/email_events_config.php	(.../email_events_config.php)	(revision 1566)
+++ trunk/kernel/units/email_events/email_events_config.php	(.../email_events_config.php)	(revision 2106)
@@ -75,6 +75,7 @@
 																	'Fields' => Array(
 																			'Description' 	=> Array( 'title'=>'la_col_Description', 'data_block' => 'label_grid_checkbox_td'),
 																			'Module' => Array( 'title'=>'la_col_Module' ),
+																			'Event' 	=> Array( 'title'=>'la_col_Event' ),
 																			'Type' 	=> Array( 'title'=>'la_col_Type' ),
 																			'Enabled' 	=> Array( 'title'=>'la_col_Status' ),
 																		),