Changes to programatically retrieve auth-server