Changes to account logic