fixed user roles on organization edit. Added tests. Fixes #379.