refactored old token usage in account edit page