Fix for server restart cookie issue