Fixed form fill on error