rejoin_channels_on_reconnect setting work-over

Fixed the received pointers and slight rewrite