fix the plan and account management