Prioritze to check the users table by fetching the username and email before going to email_addresses table for login
Merge branch 'MH-868' into dev