Xengineer/change account edit management