[#985421] Some fixes I missed when displaying errors after clicking submit