diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 81b209fb0..ba0c48cba 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -306,6 +306,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
         } else {
           self.newAddress();
         }
+        $scope.$digest();
       });
     });
   };
diff --git a/src/js/directives/directives.js b/src/js/directives/directives.js
index 93dc7f87e..95a04e9c9 100644
--- a/src/js/directives/directives.js
+++ b/src/js/directives/directives.js
@@ -27,6 +27,8 @@ angular.module('copayApp.directives')
           var URI = bitcore.URI;
           var Address = bitcore.Address
           var validator = function(value) {
+            if (!profileService.focusedClient)
+              return;
             var networkName = profileService.focusedClient.credentials.network;
             // Regular url
             if (/^https?:\/\//.test(value)) {
@@ -51,7 +53,6 @@ angular.module('copayApp.directives')
               return;
             }
 
-console.log('[directives.js.53]', value, networkName); //TODO
             // Regular Address
             ctrl.$setValidity('validAddress', Address.isValid(value, networkName));
             return value;