Always add the IP address if we can