diff --git a/index.html b/index.html
index bf11066d7..5da820527 100644
--- a/index.html
+++ b/index.html
@@ -18,7 +18,7 @@
           </figure>
           <div class="text-right" ng-show="$root.wallet">
             <div ng-if="$root.wallet.name">
-              <h5>Wallet: escape({{$root.wallet.name}}) &lt;{{$root.wallet.id}}&gt;</h5>
+              <h5>Wallet: {{$root.wallet.name}} &lt;{{$root.wallet.id}}&gt;</h5>
               <p> 
             </div>
             <div ng-if="!$root.wallet.name && $root.wallet.id">
diff --git a/js/models/network/WebRTC.js b/js/models/network/WebRTC.js
index 2f0aec30b..62e0f566c 100644
--- a/js/models/network/WebRTC.js
+++ b/js/models/network/WebRTC.js
@@ -258,8 +258,8 @@ Network.prototype._setupPeerHandlers = function(openCallback) {
     self._checkAnyPeer();
   });
 
-  p.on('connection', function(dataConn) {
 
+  p.on('connection', function(dataConn) {
     console.log('### NEW INBOUND CONNECTION %d/%d', self.connectedPeers.length, self.maxPeers);
     if (self.connectedPeers.length >= self.maxPeers) {
       console.log('### PEER REJECTED. PEER MAX LIMIT REACHED');
@@ -403,6 +403,7 @@ Network.prototype.connectTo = function(copayerId) {
 };
 
 Network.prototype._cleanUp = function() {
+  var self = this;
   self.connectedPeers = [];
   self.started = false;
   self.peerId = null;
@@ -421,9 +422,10 @@ Network.prototype._cleanUp = function() {
 Network.prototype.disconnect = function(cb, forced) {
   var self = this;
   self.closing = 1;
-  this.send(null, { type: 'disconnect' });
-  this._cleanUp();
-  if (typeof cb === 'function') cb();
+  self.send(null, { type: 'disconnect' }, function(){
+    self._cleanUp();
+    if (typeof cb === 'function') cb();
+  });
 };
 
 module.exports = require('soop')(Network);
diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js
index db4b095a6..253f02ad6 100644
--- a/js/services/controllerUtils.js
+++ b/js/services/controllerUtils.js
@@ -4,6 +4,8 @@ angular.module('copay.controllerUtils').factory('controllerUtils', function ($ro
   var root = {};
 
   root.logout = function() {
+    console.log('### DELETING WALLET'); //TODO
+    $rootScope.wallet = null;
     delete $rootScope['wallet'];
     $rootScope.totalBalance = 0;
     $location.path('signin');