Updated password/user forms to use generic entity for shared error messages