Fix some more strangeness in account handling