Fixed the client side validation
Merge branch 'master' of github.com:Petahhh/002