Fix bug #6291 - force user stop working. A previous fix broke the invariant that...