Refactor account setting