Improve style: Save a click on re-fetch on validation fail