diff --git a/index.html b/index.html
index b349ec383..73e813b51 100644
--- a/index.html
+++ b/index.html
@@ -62,7 +62,7 @@
             <section class="left-small">
               <a class="left-off-canvas-toggle menu-icon" ><span></span></a>
             </section>
-            <section class="right-small">
+            <section class="right-small" ng-if="$root.iden && $root.iden.listWallets().length >1">
               <a class="right-off-canvas-toggle p10"><i class="icon-wallet size-24"></i></a>
             </section>
 
@@ -77,7 +77,7 @@
             <div ng-include="'views/includes/sidebar-mobile.html'"></div>
           </aside>
 
-          <aside class="right-off-canvas-menu">
+          <aside class="right-off-canvas-menu" ng-if="$root.iden && $root.iden.listWallets().length >1">
             <div ng-include="'views/includes/walletbar-mobile.html'"></div>
           </aside>
           <div 
diff --git a/js/controllers/home.js b/js/controllers/home.js
index e75fe7638..630a7515b 100644
--- a/js/controllers/home.js
+++ b/js/controllers/home.js
@@ -56,21 +56,6 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
     }
   });
 
-  $scope.done = function() {
-    $rootScope.starting = false;
-    $rootScope.$digest();
-  };
-
-
-  $scope.$on("$destroy", function() {
-    var iden = $rootScope.iden;
-    if (iden) {
-      iden.removeListener('newWallet', $scope.done);
-      iden.removeListener('noWallets', $scope.done);
-    }
-  });
-
-
   $scope.openWithPin = function(pin) {
 
     if (!pin) {
@@ -92,11 +77,8 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
   $scope.openWallets = function() {
     preconditions.checkState($rootScope.iden);
     var iden = $rootScope.iden;
-
     $rootScope.hideNavigation = false;
     $rootScope.starting = true;
-    iden.on('newWallet', $scope.done);
-    iden.on('noWallets', $scope.done);
     iden.openWallets();
   };
 
@@ -169,7 +151,6 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
 
         // mobile
         if ($scope.isMobile && !$rootScope.hasPin) {
-          $scope.done();
           _credentials = {
             email: email,
             password: password,
diff --git a/js/controllers/homeWallet.js b/js/controllers/homeWallet.js
index 55c4a00bb..408872684 100644
--- a/js/controllers/homeWallet.js
+++ b/js/controllers/homeWallet.js
@@ -68,7 +68,7 @@ angular.module('copayApp.controllers').controller('HomeWalletController', functi
       removeWatch();
       w.removeListener('txProposalEvent', _updateTxs);
     };
-  });
+  }); 
 
   $scope.setAlternativeAmount = function(w, tx, cb) {
     rateService.whenAvailable(function() {
diff --git a/js/services/identityService.js b/js/services/identityService.js
index aa904d9ec..ab04c7ade 100644
--- a/js/services/identityService.js
+++ b/js/services/identityService.js
@@ -31,6 +31,7 @@ angular.module('copayApp.services')
     root.goWalletHome = function() {
       var w = $rootScope.wallet;
       if (w) {
+        $rootScope.starting = false;
         if (!w.isComplete()) {
           $location.path('/copayers');
         } else {
@@ -233,7 +234,7 @@ angular.module('copayApp.services')
 
       w.on('txProposalEvent', function(e) {
         if (root.isFocused(wid)) {
-          pendingTxsService.update(); 
+          pendingTxsService.update();
         }
 
         balanceService.update(w, function() {
@@ -288,7 +289,6 @@ angular.module('copayApp.services')
 
       var self = this;
       root.setupGlobalVariables(iden);
-
       iden.on('newWallet', function(wid) {
         var w = iden.getWalletById(wid);
         copay.logger.debug('newWallet:', w.getName(), wid, iden.getLastFocusedWalletId());
@@ -298,20 +298,25 @@ angular.module('copayApp.services')
           root.setFocusedWallet(w, true);
           root.goWalletHome();
         }
+
         // At the end (after all handlers are in place)...start the wallet.
         w.netStart();
       });
 
       iden.on('noWallets', function() {
+        notification.warning('No Wallets','Your profile has no wallet. Create one here');
+        $rootScope.starting = false;
         $location.path('/create');
-        $rootScope.$digest()
+        $timeout(function() {
+          $rootScope.$digest();
+        }, 1);
       });
 
       iden.on('walletDeleted', function(wid) {
         // do nothing. this is handled 'on sync' on controller.
       });
 
-      iden.on('walletStorageError', function (wid, message) {
+      iden.on('walletStorageError', function(wid, message) {
         notification.error('Error storing wallet', message);
       });
 
diff --git a/views/home.html b/views/home.html
index 5b7704af7..d61590cf8 100644
--- a/views/home.html
+++ b/views/home.html
@@ -111,7 +111,7 @@
       </form>
     </div>
 
-    <div ng-if='!$root.hasPin && !askForPin'>
+    <div ng-if='!$root.hasPin && !askForPin && !$root.iden'>
       <div class="clipo">
         <img src="img/clipo-signin.png" alt="clipo" width="310">
       </div>
diff --git a/views/includes/walletbar-mobile.html b/views/includes/walletbar-mobile.html
index e4c6f845d..e795e0357 100644
--- a/views/includes/walletbar-mobile.html
+++ b/views/includes/walletbar-mobile.html
@@ -2,11 +2,6 @@
   <header ng-show="$root.wallet">
     <h1>My wallets</h1>
   </header>
-  <div class="side-nav text-center off-canvas-list" ng-show="!wallets[0]">
-    <p class="size-12 text-gray m10t" translate>You do not have another wallets.</p>
-    <a href="#!/create" class="db button secondary tiny" title="Create new wallet">
-      <i class="m10r fi-plus"></i> {{'Create new wallet' | translate }} </a>
-  </div>
   <ul class="side-nav wallets off-canvas-list" ng-show="wallets[0]">
     <li 
       ng-repeat="item in wallets track by $index"