Index: branches/5.2.x/units/orders/orders_event_handler.php
===================================================================
diff -u -N -r14986 -r15009
--- branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 14986)
+++ branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 15009)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 14986 2012-01-04 16:11:56Z alex $
+* @version	$Id: orders_event_handler.php 15009 2012-01-06 20:37:54Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -2345,7 +2345,10 @@
 		$user_id = $object->GetDBField('PortalUserId');
 
 		if ( $user_id ) {
-			$user_info = $this->Conn->GetRow('SELECT *, CONCAT(FirstName,\' \',LastName) AS UserTo FROM '.TABLE_PREFIX.'PortalUser WHERE PortalUserId = '.$user_id);
+			$sql = 'SELECT *, CONCAT(FirstName,\' \',LastName) AS UserTo
+					FROM ' . TABLE_PREFIX . 'Users
+					WHERE PortalUserId = ' . $user_id;
+			$user_info = $this->Conn->GetRow($sql);
 
 			$fields = Array(
 				'UserTo'=>'UserTo','UserPhone'=>'Phone','UserFax'=>'Fax','UserEmail'=>'Email',
@@ -3951,7 +3954,7 @@
 		if ( $create_account && $object->GetDBField('PortalUserId') == USER_GUEST && $billing_email ) {
 			// check that e-mail available
 			$sql = 'SELECT PortalUserId
-					FROM ' . TABLE_PREFIX . 'PortalUser
+					FROM ' . TABLE_PREFIX . 'Users
 					WHERE Email = ' . $this->Conn->qstr($billing_email);
 			$user_id = $this->Conn->GetOne($sql);