Fixed Org selector issue in login