Improve organization member handling
Fix permission changing bug