Fix on client js and client validation