Remove special case for default account
Serialize account name key