Index: branches/5.2.x/units/listings/listings_config.php
===================================================================
diff -u -N -r15431 -r15561
--- branches/5.2.x/units/listings/listings_config.php	(.../listings_config.php)	(revision 15431)
+++ branches/5.2.x/units/listings/listings_config.php	(.../listings_config.php)	(revision 15561)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: listings_config.php 15431 2012-07-12 14:50:01Z alex $
+* @version	$Id: listings_config.php 15561 2012-10-09 16:04:43Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -106,7 +106,7 @@
 					'CalculatedFields'	=>	Array (
 													''	=>	Array (
 																	'LinkName'	=>	'CONCAT(item_table.Name, " (", item_table.Url, ")")',
-																	'LinkOwner'	=>	'IF (ISNULL(u.Username), IF (item_table.CreatedById = ' . USER_ROOT . ', "root", IF (item_table.CreatedById = ' . USER_GUEST . ', "Guest", "n/a")), u.Username)',
+																	'LinkOwner'	=>	'IF (ISNULL(u.Username), IF (item_table.CreatedById = ' . USER_ROOT . ', "root", IF (item_table.CreatedById = ' . USER_GUEST . ', "Guest", "n/a")), IF(u.Username = "", u.Email, u.Username))',
 															),
 											),
 					'Fields' => Array (
Index: branches/5.2.x/units/links/links_config.php
===================================================================
diff -u -N -r15469 -r15561
--- branches/5.2.x/units/links/links_config.php	(.../links_config.php)	(revision 15469)
+++ branches/5.2.x/units/links/links_config.php	(.../links_config.php)	(revision 15561)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: links_config.php 15469 2012-07-23 17:08:36Z alex $
+* @version	$Id: links_config.php 15561 2012-10-09 16:04:43Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -396,7 +396,7 @@
 
 					'CalculatedFields' => Array (
 						'' => Array (
-							'UserName' => 'IF (ISNULL(u.Username), IF (%1$s.CreatedById = ' . USER_ROOT . ', "root", IF (%1$s.CreatedById = ' . USER_GUEST . ', "Guest", "n/a")), u.Username)',
+							'UserName' => 'IF (ISNULL(u.Username), IF (%1$s.CreatedById = ' . USER_ROOT . ', "root", IF (%1$s.CreatedById = ' . USER_GUEST . ', "Guest", "n/a")), IF(u.Username = "", u.Email, u.Username))',
 							'CategoryId' => TABLE_PREFIX.'%3$sCategoryItems.CategoryId',
 							'Filename' => TABLE_PREFIX.'%3$sCategoryItems.Filename',
 							'CategoryFilename' => TABLE_PREFIX.'Categories.NamedParentPath',
@@ -467,14 +467,12 @@
 			            	'type' => 'int',
 			            	'formatter' => 'kLEFTFormatter',
 			            	'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',
+			            	'left_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Users WHERE %s',
+			            	'left_key_field' => 'PortalUserId', 'left_title_field' => USER_TITLE_FIELD,
 							'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'),
 			            	'sample_value' => 'Guest', 'required' => 1, 'default' => NULL,
 						),
-			            'ModifiedById'		=>	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),
+			            'ModifiedById'		=>	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),
 			            'Priority'			=>	Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 			            'Status'			=>	Array (
 			            	'type' => 'int',