More changes to account functions.