ENGINE-732: Separate Users and Operators

Subtask ENGINE-750 is ready for review.
Joao confirmed this field will be used for both users and operators