Edit account improvment