OMS-369: Extend User model with optional 'userid' field