Improved disconnect/home signal logic