Fixed basic client side validation