Updating user attributes causes database error

Updating a user's attributes requires a remove then add of common attributes. The remove can, in some circumstances, get flushed after the add. This causes a constraint violation as the add happens before the remove.