Organizations: fixes

Fixed account creating/removing issues