Added organization admin and s/actived/active