Patch 6 Fix the cookie remember bug