OO-2891: Update the User only if some attribute values have changed. Wording, testing, mMinor improvements in code redability.