gistfile1.txt

diff --git a/src/datasource.ts b/src/datasource.ts
index 25e4427..e5aa5df 100644
--- a/src/datasource.ts
+++ b/src/datasource.ts
@@ -126,12 +126,14 @@ export default class IrondbDatasource {
       headers['X-Circonus-App-Name'] = this.appName;
     }
     if ('standalone' == this.irondbType && !isCaql) {
+      headers['X-Circonus-Account'] = this.accountId;
       baseUrl = baseUrl + '/graphite/' + this.accountId;
       if (!isFind) {
         baseUrl = baseUrl + '/' + this.queryPrefix + '/series_multi';
       }
     }
     if (isCaql && !isFind) {
+      headers['X-Circonus-Account'] = this.accountId;
       baseUrl = baseUrl + '/extension/lua/caql_v1';
     }

@@ -156,6 +158,8 @@ export default class IrondbDatasource {
     if ('hosted' == this.irondbType) {
       headers['X-Circonus-Auth-Token'] = this.apiToken;
       headers['X-Circonus-App-Name'] = this.appName;
+    } else {
+      headers['X-Circonus-Account'] = this.accountId;
     }
     if (irondbOptions['std']['names'].length) {
       options = {};