diff --git a/lib/core/modules/coderunner/codeRunner.js b/lib/core/modules/coderunner/codeRunner.js
index c4b471de1..1e98850b1 100644
--- a/lib/core/modules/coderunner/codeRunner.js
+++ b/lib/core/modules/coderunner/codeRunner.js
@@ -36,9 +36,6 @@ class CodeRunner {
       this.runCode.registerVar('Web3', Web3);
       this.runCode.registerVar('EmbarkJS', EmbarkJS);
       this.events.on('code-generator-ready', () => {
-        this.events.request('code-generator:web3js', ((_err, code) => {
-          this.runCode.doEval(code);
-        }));
         this.events.request('code-generator:embarkjs:provider-code', (code) => {
           this.runCode.doEval(code);
           const codeTypes = {
diff --git a/lib/modules/ens/embarkjs.js b/lib/modules/ens/embarkjs.js
index 7e84f1046..31535aca8 100644
--- a/lib/modules/ens/embarkjs.js
+++ b/lib/modules/ens/embarkjs.js
@@ -157,9 +157,9 @@ __embarkENS.setProvider = function (config) {
       .then((id) => {
       const registryAddress = self.registryAddresses[id] || config.registryAddress;
       self._isAvailable = true;
-      self.ens = new EmbarkJS.Contract({abi: config.registryAbi, address: registryAddress});
-      self.registrar = new EmbarkJS.Contract({abi: config.registrarAbi, address: config.registrarAddress});
-      self.resolver = new EmbarkJS.Contract({abi: config.resolverAbi, address: config.resolverAddress});
+      self.ens = new EmbarkJS.Contract({abi: config.registryAbi, address: registryAddress, web3: web3});
+      self.registrar = new EmbarkJS.Contract({abi: config.registrarAbi, address: config.registrarAddress, web3: web3});
+      self.resolver = new EmbarkJS.Contract({abi: config.resolverAbi, address: config.resolverAddress, web3: web3});
     })
       .catch(err => {
         if (err.message.indexOf('Provider not set or invalid') > -1) {