preserve user logic when adding client validation