Fix for getting a corp with better performance for CREST mails