few changes to validation

because of copy/pasting, needed to make a few changes to the second
validation statement.