Use new function getIdentityForEmail where possible
Remove unnecessary if(!isDefault)