Wifi: Keep up with some recent changes in Login services in core.