Case #3457 - Added opt-out field