Cannot disconnect users

Rerolled against latest 2.x-dev branch.

Ran into this same issue. Patch applied cleanly and fixed issue. Patch works with both 2.x and 3.x.

Ran into same issue. The 2.x patch does not apply cleanly, but did fix 3.x when adapted.

Oh, and I do hope the fact this bug was filed against 2.x is not resulting in it getting ignored, it spans versions.
Maybe a new one should be filed for 3.x

I confirm that patch works, and can be applied, also for 3.x branch.