Improve account handling