Fixed incorrect markup if form-validate is used