fixing server side validation part2