Index: branches/5.2.x/core/units/system_event_subscriptions/system_event_subscriptions_config.php
===================================================================
diff -u -N -r15290 -r15563
--- branches/5.2.x/core/units/system_event_subscriptions/system_event_subscriptions_config.php	(.../system_event_subscriptions_config.php)	(revision 15290)
+++ branches/5.2.x/core/units/system_event_subscriptions/system_event_subscriptions_config.php	(.../system_event_subscriptions_config.php)	(revision 15563)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: system_event_subscriptions_config.php 15290 2012-04-11 16:21:33Z alex $
+* @version	$Id: system_event_subscriptions_config.php 15563 2012-10-09 16:05:41Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -80,7 +80,7 @@
 		'' => Array (
 			'BindToSystemEvent' => 'ee.BindToSystemEvent',
 			'EmailEventName' => 'ee.Event',
-			'Username' => 'CASE %1$s.UserId WHEN ' . USER_ROOT . ' THEN "root" WHEN ' . USER_GUEST . ' THEN "Guest" ELSE IF(CONCAT(u.FirstName, u.LastName) <> "", CONCAT(u.FirstName, " ", u.LastName), IF(%1$s.UserId IS NULL, "Guest", u.Username)) END',
+			'Username' => 'CASE %1$s.UserId WHEN ' . USER_ROOT . ' THEN "root" WHEN ' . USER_GUEST . ' THEN "Guest" ELSE IF(CONCAT(u.FirstName, u.LastName) <> "", CONCAT(u.FirstName, " ", u.LastName), IF(%1$s.UserId IS NULL, "Guest", IF(u.Username = "", u.Email, u.Username))) END',
 			'CategoryName' => 'c.l%2$s_Name',
 			'ItemName' => '%1$s.ItemId',
 			'ParentItemName' => '%1$s.ParentItemId',
@@ -101,7 +101,7 @@
 			'required' => 1, 'default' => NULL
 		),
 		'SubscriberEmail' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
-		'UserId' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Users WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Username', 'default' => NULL),
+		'UserId' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (USER_ROOT => 'root', USER_GUEST => 'Guest'), 'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Users WHERE %s', 'left_key_field' => 'PortalUserId', 'left_title_field' => USER_TITLE_FIELD, 'default' => NULL),
 		'CategoryId' => Array ('type' => 'int', 'default' => NULL),
 		'IncludeSublevels' => Array (
 			'type' => 'int',