diff --git a/js/models/network/WebRTC.js b/js/models/network/WebRTC.js
index 5877f45a2..675893af7 100644
--- a/js/models/network/WebRTC.js
+++ b/js/models/network/WebRTC.js
@@ -147,6 +147,7 @@ Network.prototype._addConnectedCopayer = function(copayerId, isInbound) {
   var peerId = this.peerFromCopayer(copayerId);
   this._addCopayerMap(peerId,copayerId);
   Network._arrayPushOnce(peerId, this.connectedPeers);
+  this.emit('connect', copayerId);
 };
 
 Network.prototype._onData = function(encStr, isInbound, peerId) {
@@ -177,7 +178,6 @@ Network.prototype._onData = function(encStr, isInbound, peerId) {
     console.log('#### Peer sent hello. Setting it up.'); //TODO
     this._addConnectedCopayer(payload.copayerId, isInbound);
     this._setInboundPeerAuth(peerId, true);
-    this.emit('connect', payload.copayerId);
     return;
   }
 
@@ -223,9 +223,8 @@ Network.prototype._setupConnectionHandlers = function(dataConn, toCopayerId) {
 
       // The connecting peer send hello 
       if(toCopayerId) {
-        self._addConnectedCopayer(toCopayerId);
         self._sendHello(toCopayerId);      
-        self.emit('connect', toCopayerId); // TODO: try to unify both 'connect' emits
+        self._addConnectedCopayer(toCopayerId);
       }
     }
   });
@@ -423,7 +422,7 @@ Network.prototype.lockIncommingConnections = function(allowedCopayerIdsArray) {
   
   this.allowedCopayerIds={};
   for(var i in allowedCopayerIdsArray) {
-    this.allowedCopayerIds[ allowedCopayerIdsArray[i] ] = 1;
+    this.allowedCopayerIds[ allowedCopayerIdsArray[i] ] = true;
   }
 };
 
diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js
index e3574c5fe..76dbb8fdf 100644
--- a/js/services/controllerUtils.js
+++ b/js/services/controllerUtils.js
@@ -91,6 +91,7 @@ angular.module('copay.controllerUtils')
       });
       w.on('openError', root.onErrorDigest);
       w.on('connect', function(peerID) {
+        //alert(w.getRegisteredPeerIds());
         if (peerID) {
           video.callPeer(peerID, handlePeerVideo);
         }