added logic to check and see if the user is a volunteer or org user.