hot fix to address bug in email matching.
Merge branch 'hotfix/fix_email_matching'