Mass import: earlier user fix
Mass import: Fix error messages
Add .invalid class only when we have an error message