Cleanup fix in ui/front/form.php