added support for username and email check