Fix problems when changing connection's scope from user to system and

vice-versa. I am not happy about what I had to do to fix the problems,
this code should really be refactored, but seems to work now. Please
test.

CCBUG: 272138