Retrieve username for authentication if email is present fixes #1626
Merge pull request #1627 from CartoDB/1626-Users_cannot_log_in_with_email_address

Retrieve username for authentication if email is present fixes #1626