Fix validation of complete form