Reorder form validation to prevent dup file check from masking required