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);