Login and network list cleanup

Related: #394 and #576