further work on org validation and authentication