Implemented working with non-organizational accounts