NXP-14069: Clean up in addon userRegistration