Fix to account id scoping in schedule build