Fix issues with CSRF token changing after login/logout