Index: branches/5.2.x/core/units/email_events/email_events_event_handler.php
===================================================================
diff -u -N -r14675 -r14726
--- branches/5.2.x/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 14675)
+++ branches/5.2.x/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 14726)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_events_event_handler.php 14675 2011-10-19 08:29:34Z alex $
+* @version	$Id: email_events_event_handler.php 14726 2011-11-03 08:43:30Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -244,7 +244,7 @@
 					case EmailEvent::ADDRESS_TYPE_USER:
 						$sql = 'SELECT FirstName, LastName, Email, PortalUserId
 								FROM ' . TABLE_PREFIX . 'PortalUser
-								WHERE Login = ' . $this->Conn->qstr($address);
+								WHERE Username = ' . $this->Conn->qstr($address);
 						$user_info = $this->Conn->GetRow($sql);
 
 						if ($user_info) {
@@ -416,7 +416,7 @@
 						case EmailEvent::ADDRESS_TYPE_USER:
 							$sql = 'SELECT FirstName, LastName, Email
 									FROM ' . TABLE_PREFIX . 'PortalUser
-									WHERE Login = ' . $this->Conn->qstr($address);
+									WHERE Username = ' . $this->Conn->qstr($address);
 							$user_info = $this->Conn->GetRow($sql);
 
 							if ($user_info) {
@@ -506,7 +506,7 @@
 			// 2. replace tags if needed
 			$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="UserName"' => '<inp2:u_Field name="Username"',
 				'<inp:touser _Field' => '<inp2:u_Field name',
 			);
 
@@ -1000,7 +1000,7 @@
 				case EmailEvent::ADDRESS_TYPE_USER:
 					$sql = 'SELECT PortalUserId
 							FROM ' . TABLE_PREFIX . 'PortalUser
-							WHERE Login = ' . $this->Conn->qstr($address);
+							WHERE Username = ' . $this->Conn->qstr($address);
 					if (!$this->Conn->GetOne($sql)) {
 						$object->SetError($field_prefix . 'Address', 'invalid_user');
 					}
@@ -1069,7 +1069,7 @@
 					break;
 
 				case EmailEvent::ADDRESS_TYPE_USER:
-					$field = 'Login';
+					$field = 'Username';
 					$table_name = TABLE_PREFIX . 'PortalUser';
 					break;