Update the ugly matching to check the user data before submit