Restructered this if, when a server_ipaddress is provided, just use that