Fix Primary server can't be changed issue