Fix issue with requiring password to confirm user and edit user