Added opt out feature to Volunteer side