diff --git a/lib/historyKeeper.js b/lib/historyKeeper.js
index 95cb43e56..1d938ccfd 100644
--- a/lib/historyKeeper.js
+++ b/lib/historyKeeper.js
@@ -66,7 +66,8 @@ module.exports.create = function (config, cb) {
         flushCache: config.flushCache,
         adminEmail: config.adminEmail,
         allowSubscriptions: config.allowSubscriptions,
-        myDomain: config.myDomain,
+        myDomain: config.httpUnsafeOrigin,
+        // XXX not included in the config...
         mySubdomain: config.mySubdomain,
         customLimits: config.customLimits || {},
         // FIXME this attribute isn't in the default conf
diff --git a/scripts/check-accounts.js b/scripts/check-accounts.js
index 4d0067d43..9e75da0c6 100644
--- a/scripts/check-accounts.js
+++ b/scripts/check-accounts.js
@@ -4,7 +4,7 @@ var Config = require("../lib/load-config");
 var Package = require("../package.json");
 
 var body = JSON.stringify({
-    domain: Config.myDomain,
+    domain: Config.myDomain || Config.httpUnsafeOrigin,
     subdomain: Config.mySubdomain || null,
     adminEmail: Config.adminEmail,
     version: Package.version,