Connection status save and update fix

See comment in the code.