Merge pull request #286 from settinghead/master

Preserve cid when not logged in and apply later
Merge pull request #288 from settinghead/master

Fix cookie_policy error