Use primary address for next server, everywhere