diff --git a/lib/core/config.js b/lib/core/config.js
index cebc9282..c3786efb 100644
--- a/lib/core/config.js
+++ b/lib/core/config.js
@@ -282,9 +282,7 @@ Config.prototype.loadNameSystemConfigFile = function() {
   // todo: spec out names for registration in the file itself for a dev chain
   var configObject = {
     "default": {
-      "available_providers": ["ens"],
-      "provider": "ens",
-      "enabled": true
+      "enabled": false
     }
   };
 
diff --git a/lib/modules/ens/index.js b/lib/modules/ens/index.js
index b03c3ba4..bef34d59 100644
--- a/lib/modules/ens/index.js
+++ b/lib/modules/ens/index.js
@@ -33,7 +33,7 @@ class ENS {
     this.events.setCommandHandler("storage:ens:associate", this.associateStorageToEns.bind(this));
   }
 
-  setProviderAndRegisterDomains(cb = () => {}) {
+  setProviderAndRegisterDomains(cb) {
     const self = this;
     async.parallel([
       function getENSRegistry(paraCb) {
diff --git a/templates/boilerplate/config/namesystem.js b/templates/boilerplate/config/namesystem.js
index 35ef7e9a..f3d14468 100644
--- a/templates/boilerplate/config/namesystem.js
+++ b/templates/boilerplate/config/namesystem.js
@@ -1,6 +1,7 @@
 module.exports = {
   // default applies to all environments
   default: {
+    enabled: true,
     available_providers: ["ens"],
     provider: "ens"
   },
diff --git a/templates/demo/config/namesystem.js b/templates/demo/config/namesystem.js
index 00c8ab1f..05a737b9 100644
--- a/templates/demo/config/namesystem.js
+++ b/templates/demo/config/namesystem.js
@@ -1,6 +1,7 @@
 module.exports = {
   // default applies to all environments
   default: {
+    enabled: true,
     available_providers: ["ens"],
     provider: "ens"
   },