Limit comp users

merging in next story