Keep invalid entry for user form & migration to PSR2