fix finding and checking org account