Fixed default account setting if nil is passed