diff --git a/css/tpl-default.css b/css/tpl-default.css
index 9e1f7b00e..d2bf404c0 100644
--- a/css/tpl-default.css
+++ b/css/tpl-default.css
@@ -110,7 +110,7 @@ body {
   background: #fff;
 }
 
-.addresses .panel:hover {
+.addresses .panel:hover, .addresses .panel.selected {
   background: #efefef;
 }
 
diff --git a/index.html b/index.html
index b11efa204..96b0c03b2 100644
--- a/index.html
+++ b/index.html
@@ -314,13 +314,12 @@
  
     <!-- ADDRESS -->
     <script type="text/ng-template" id="addresses.html">
-      <div class="addresses" data-ng-controller="AddressesController">
+      <div class="addresses" ng-controller="AddressesController">
         <div ng-show='$root.wallet.publicKeyRing.isComplete()'>
           <div class="row">
             <div class="large-9 medium-12 columns" ng-if="addrInfos[0]">
               <div class="large-8 medium-8 columns">
-                <a class="panel radius db" ng-repeat="addrInfo in addrInfos"
-                  ng-click="selectAddr(addrInfo.address.toString())">
+                <a class="panel radius db" ng-repeat="addrInfo in addrInfos" ng-click="$root.selectedAddr = addrInfo.address.toString()" ng-class="selectAddr('{{addrInfo.address.toString()}}')">
                   <span>{{addrInfo.address.toString()}}</span>
                   <span ng-if="addrInfo.isChange">(change)</span>
                   <span class="right">
diff --git a/js/controllers/addresses.js b/js/controllers/addresses.js
index bba9aced4..a17a44aa2 100644
--- a/js/controllers/addresses.js
+++ b/js/controllers/addresses.js
@@ -1,23 +1,24 @@
 'use strict';
 
 angular.module('copay.addresses').controller('AddressesController',
-  function($scope, $rootScope, controllerUtils) {
+  function($scope, $rootScope, $timeout, controllerUtils) {
     $scope.loading = false;
     var w = $rootScope.wallet;
+
     $scope.newAddr = function() {
-      $scope.loading=true;
+      $scope.loading = true;
       w.generateAddress(null, function() {
-        setTimeout(function() {
+        $timeout(function() {
           controllerUtils.setSocketHandlers();
           controllerUtils.updateAddressList();
-          $scope.loading=false;
+          $rootScope.selectedAddr = $rootScope.addrInfos[0].address.toString();
+          $scope.loading = false;
           $rootScope.$digest();
         },1);
       });
     };
 
-    $scope.selectAddr = function(addr) {
-      $scope.selectedAddr = addr;
+    $scope.selectAddr = function (addr) {
+      return addr === $rootScope.selectedAddr ? 'selected' : '';
     };
-
   });
diff --git a/js/controllers/signin.js b/js/controllers/signin.js
index 37a600e32..1538cd8a6 100644
--- a/js/controllers/signin.js
+++ b/js/controllers/signin.js
@@ -67,6 +67,8 @@ angular.module('copay.signin').controller('SigninController',
           if (err || !w) {
             if (err === 'joinError') 
               $rootScope.flashMessage = { message: 'Can not find peer'};
+            else if (err === 'walletFull')
+              $rootScope.flashMessage = { message: 'The wallet is full'};
             else if (err === 'badSecret')  
               $rootScope.flashMessage = { message: 'Bad secret secret string', type: 'error'};
             else 
diff --git a/js/models/core/WalletFactory.js b/js/models/core/WalletFactory.js
index 21deb626f..fc7f0ee77 100644
--- a/js/models/core/WalletFactory.js
+++ b/js/models/core/WalletFactory.js
@@ -200,8 +200,14 @@ WalletFactory.prototype.joinCreateSession = function(secret, nickname, passphras
   self.network.cleanUp();
   self.network.start(opts, function() {
     self.network.connectTo(s.pubKey);
+
+    // This is a hack to reconize if the connection was rejected or the peer wasn't there.
+    var connectedOnce = false;
+    self.network.on('connected', function(sender, data) {
+      connectedOnce = true;
+    });
     self.network.on('onlyYou', function(sender, data) {
-      return cb('joinError');
+      return cb(connectedOnce ? 'walletFull' : 'joinError');
     });
     self.network.on('data', function(sender, data) {
       if (data.type ==='walletId') {
diff --git a/js/models/network/WebRTC.js b/js/models/network/WebRTC.js
index 06e230537..41719dd9e 100644
--- a/js/models/network/WebRTC.js
+++ b/js/models/network/WebRTC.js
@@ -223,6 +223,7 @@ Network.prototype._setupConnectionHandlers = function(dataConn, toCopayerId) {
 
       // The connecting peer send hello 
       if(toCopayerId) {
+        self.emit('connected');
         self._sendHello(toCopayerId);      
         self._addConnectedCopayer(toCopayerId);
       }
diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js
index 1b36334bd..c0829ebda 100644
--- a/js/services/controllerUtils.js
+++ b/js/services/controllerUtils.js
@@ -19,7 +19,7 @@ angular.module('copay.controllerUtils')
       video.close();
       // Clear rootScope
       for (var i in $rootScope) {
-        if (i.charAt(0) != '$') {
+        if (i.charAt(0) != '$' && i != 'flashMessage') {
           delete $rootScope[i];
         }
       }