diff --git a/config.js b/config.js
index db5adf8..90b92b7 100644
--- a/config.js
+++ b/config.js
@@ -18,10 +18,10 @@ var config = {
   },
   lockOpts: {
     //  To use locker-server, uncomment this:
-    // lockerServer: {
-    //   host: 'localhost',
-    //   port: 3231,
-    // },
+    lockerServer: {
+      host: 'localhost',
+      port: 3231,
+    },
   },
   messageBrokerOpts: {
     //  To use message broker server, uncomment this:
diff --git a/lib/blockchainmonitor.js b/lib/blockchainmonitor.js
index f89edb6..a756b3f 100644
--- a/lib/blockchainmonitor.js
+++ b/lib/blockchainmonitor.js
@@ -9,6 +9,8 @@ log.debug = log.verbose;
 var BlockchainExplorer = require('./blockchainexplorer');
 var Storage = require('./storage');
 var MessageBroker = require('./messagebroker');
+var Lock = require('./lock');
+var EmailService = require('./emailservice');
 
 var Notification = require('./model/notification');
 
@@ -84,7 +86,6 @@ BlockchainMonitor.prototype._initExplorer = function(provider, network, url) {
 
 BlockchainMonitor.prototype._handleIncommingTx = function(data) {
   var self = this;
-  var walletId = walletService.walletId;
 
   if (!data || !data.vout) return;
 
diff --git a/lib/templates/new_copayer.plain b/lib/templates/new_copayer.plain
new file mode 100644
index 0000000..2cc1e53
--- /dev/null
+++ b/lib/templates/new_copayer.plain
@@ -0,0 +1,2 @@
+<%= subjectPrefix %>New copayer
+A new copayer just joined your wallet <%= walletName %>.
diff --git a/messagebroker/bws-messagebroker.js b/messagebroker/messagebroker.js
similarity index 100%
rename from messagebroker/bws-messagebroker.js
rename to messagebroker/messagebroker.js