[IMP] account : Improve code and use proper decorators