fix: More fixes in controller.Account