companies users fixed (some work left)