readded user validation checks that were removed for testing earlier