Follow-up

 * getOrCreateUser returns a boolean indicating whether or not the user was created
 * Only updating the user during import when there is a diff