Improved security of OptInHandler.
Merge pull request #31 from travelton/ImproveOptInSecurity

Improved security of OptInHandler.