Fix user attribute pre-population bug