setAccount refactoring