minor change to set emails right