WHT-31 

Pull request for review from @elmariofredo 
don't show our company emails. Thanks