Index: trunk/kernel/include/usersession.php
===================================================================
diff -u -r1854 -r1868
--- trunk/kernel/include/usersession.php	(.../usersession.php)	(revision 1854)
+++ trunk/kernel/include/usersession.php	(.../usersession.php)	(revision 1868)
@@ -435,7 +435,8 @@
         	$db =& $this->adodbConnection;
         	$prefix = GetTablePrefix();
 
-        	$key_clause = $objConfig->Get('Email_As_Login') ? 'pu.Email = %1$s' : 'pu.Login = %1$s';
+        	//$key_clause = $objConfig->Get('Email_As_Login') ? 'pu.Email = %1$s' : 'pu.Login = %1$s';
+        	$key_clause = 'pu.Email = %1$s OR pu.Login = %1$s';
         	
         	$sql = 'SELECT *, MD5(pu.Password) AS md5pw
           			FROM '.$prefix.'PortalUser pu