Allow change of server - fix it 2