9.19: improve new server registration process.