Completed validation implementation on the client