Changes: ACCOUNT_TYPE_DEFAULT