Merge pull request #2184 from kyle30312/logout-cookie-fix