While that worked, we also need to dirty patch the logout. Now it's perfect!