Index: branches/unlabeled/unlabeled-1.29.2/core/units/email_events/email_events_event_handler.php
===================================================================
diff -u -r7748 -r7812
--- branches/unlabeled/unlabeled-1.29.2/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 7748)
+++ branches/unlabeled/unlabeled-1.29.2/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 7812)
@@ -247,14 +247,15 @@
 			}
 			
 			// 3. replace tags if needed
-			// $replacement_tags = $message->GetDBField('ReplacementTags');
-			// $replacement_tags = $replacement_tags ? unserialize($replacement_tags) : Array ();
-			
-			$replacement_tags = Array (
+			$default_replacement_tags = Array (
 				'<inp:touser _Field="password"' => '<inp2:u_Field name="Password_plain"',
 				'<inp:touser _Field="UserName"' => '<inp2:u_Field name="Login"',
 				'<inp:touser _Field' => '<inp2:u_Field name',
 			);
+			
+			$replacement_tags = $message->GetDBField('ReplacementTags');
+			$replacement_tags = $replacement_tags ? unserialize($replacement_tags) : Array ();
+			$replacement_tags = array_merge_recursive2($default_replacement_tags, $replacement_tags);
 
 			foreach ($replacement_tags as $replace_from => $replace_to) {
 				$message_body = str_replace($replace_from, $replace_to, $message_body);
Index: branches/unlabeled/unlabeled-1.3.2/core/units/email_messages/email_messages_config.php
===================================================================
diff -u -r7701 -r7812
--- branches/unlabeled/unlabeled-1.3.2/core/units/email_messages/email_messages_config.php	(.../email_messages_config.php)	(revision 7701)
+++ branches/unlabeled/unlabeled-1.3.2/core/units/email_messages/email_messages_config.php	(.../email_messages_config.php)	(revision 7812)
@@ -53,14 +53,15 @@
 						),
 					),
 
-					'Fields'			=>	Array(
-						'EmailMessageId' => Array(),
-						'Template' => Array('type' => 'string','default' => ''),
-						'MessageType' => Array('type' => 'string', 'formatter'=>'kOptionsFormatter', 'options'=>Array('text'=>'la_Text','html'=>'la_Html'), 'not_null' => '1','default' => 'text'),
-						'LanguageId' => Array('type' => 'int','not_null' => '1','default' => '0'),
-						'EventId' => Array('type' => 'int','not_null' => '1','default' => '0'),
-						'Subject'	=>	Array('type'=>'string'),
-	        ),
+					'Fields' => Array (
+						'EmailMessageId'	=>	Array(),
+						'Template'			=>	Array('type' => 'string','default' => ''),
+						'ReplacementTags'	=>	Array ('type' => 'string', 'not_null' => 1, 'default' => 'a:0:{}'),
+						'MessageType'		=>	Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('text'=>'la_Text','html'=>'la_Html'), 'not_null' => '1','default' => 'text'),
+						'LanguageId'		=>	Array('type' => 'int', 'not_null' => '1', 'default' => '0'),
+						'EventId'			=>	Array('type' => 'int', 'not_null' => '1', 'default' => '0'),
+						'Subject'			=>	Array('type' => 'string'),
+	        		),
 
 					'VirtualFields'		=>	Array(
 						'Headers'	=>	Array('type'=>'string'),