fixed some problems with default_scope for account.id