[IMP] account : Improve the codes