better support for custom orgServer URLs