Removed saving the default account - it's not thread safe