diff --git a/cmd/cmd_controller.js b/cmd/cmd_controller.js
index 646f9058b..842303a32 100644
--- a/cmd/cmd_controller.js
+++ b/cmd/cmd_controller.js
@@ -314,6 +314,7 @@ class EmbarkController {
             web3Endpoint: web3Config.providerUrl
           };
           const provider = new Provider(providerOptions);
+          web3.eth.defaultAccount = web3Config.defaultAccount;
           provider.startWeb3Provider(() => {
             engine.events.emit("runcode:register", "web3", web3);
             async.each(commands, ({varName, code}, next) => {
diff --git a/lib/modules/console/index.js b/lib/modules/console/index.js
index 95ec59675..d38a96d6d 100644
--- a/lib/modules/console/index.js
+++ b/lib/modules/console/index.js
@@ -79,11 +79,12 @@ class Console {
     this.events.emit('runcode:register', 'Web3', Web3, false);
     this.events.emit('runcode:register', 'EmbarkJS', EmbarkJS, false);
 
-    this.events.once('code-generator-ready', () => {
-      if (this.ipc.connected) {
-        return;
-      }
+    EmbarkJS.Blockchain.done = true;
+    if (this.ipc.connected) {
+      return;
+    }
 
+    this.events.once('code-generator-ready', () => {
       this.events.request('code-generator:embarkjs:provider-code', (code) => {
         const func = () => {};
         this.events.request('runcode:eval', code, func, true);