Bug867218 follow-up-fix

there were still issues with cookie management.