Fixed switching / disabling of network service

continuing for bnc864619
Nice cleanup !