introduction of default account management
correction in default account handling