Merge pull request #1 from Edzelopez/BREN-6

BREN-6 Fixed code for searching non-primary email addresses as well. Bug...
BREN-6 Reverted changes