ID-50: Update user object properties for 2.0.x
fix small conflict