F56 - email match
Merge pull request #882 from tonyrd/development

F56 - email match