updated user to be more idempotent