Fix manageAccount bugs