Improved ClientConverter to use Id instead of name, made the error i18n friendly as well
Improved ClientConverter (from Step3/Step4)