Index: trunk/core/units/email_events/email_events_event_handler.php
===================================================================
diff -u -N -r6625 -r6791
--- trunk/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 6625)
+++ trunk/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 6791)
@@ -196,6 +196,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 = str_replace('<inp:touser _Field="password"', '<inp2:u_Field name="Password_plain"', $message_template);
+			$message_template = str_replace('<inp:touser _Field="UserName"', '<inp2:u_Field name="Login"', $message_template);
 			$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;