CONTRIB-5250: Removed duplicate user fields from SQL query