Changes to use a new active account