remove edit not longer required and add error messages for passworfd change in