Fixes #6722 Put form errors in one template so they're in sync