fix updateBy method to correctly populate user references
Merge branch 'mikedev'