Fix org selection on login

Login org selection, API tweaks in the client