diff --git a/bower.json b/bower.json
index cf1a4f301..ed357189c 100644
--- a/bower.json
+++ b/bower.json
@@ -21,6 +21,7 @@
     "bitcore": "0.1.34",
     "angular-moment": "~0.7.1",
     "socket.io-client": ">=1.0.0",
-    "mousetrap": "1.4.6"
+    "mousetrap": "1.4.6",
+    "ng-idle": "*"
   }
 }
diff --git a/css/main.css b/css/main.css
index 83a2ad75f..9841917df 100644
--- a/css/main.css
+++ b/css/main.css
@@ -258,6 +258,11 @@ a:hover {
   margin-bottom: 20px;
 }
 
+.box-setup label small.has-error {
+  font-size: 11px;
+  color: #FFA59B;
+}
+
 .last-transactions {
   margin-bottom: 2rem;
   background-color: #E8EAEF;
diff --git a/index.html b/index.html
index acc29b64d..6369c9331 100644
--- a/index.html
+++ b/index.html
@@ -62,6 +62,7 @@
   <script src="lib/angular-moment/angular-moment.js"></script>
   <script src="lib/qrcode-generator/js/qrcode.js"></script>
   <script src="lib/angular-qrcode/qrcode.js"></script>
+  <script src="lib/ng-idle/angular-idle.min.js"></script>
   <script src="lib/angular-foundation/mm-foundation.min.js"></script>
   <script src="lib/angular-foundation/mm-foundation-tpls.min.js"></script>
   <script src="lib/peer.js"></script> <!-- TODO Change this on PeerJS version 0.3.9 -->
diff --git a/js/app.js b/js/app.js
index cf5656438..058dfbba6 100644
--- a/js/app.js
+++ b/js/app.js
@@ -27,6 +27,7 @@ var copayApp = window.copayApp = angular.module('copayApp', [
   'angularMoment',
   'mm.foundation',
   'monospaced.qrcode',
+  'ngIdle',
   'copayApp.filters',
   'copayApp.services',
   'copayApp.controllers',
@@ -40,6 +41,7 @@ copayApp.config(function($sceDelegateProvider) {
   ]);
 });
 
+
 angular.module('copayApp.filters', []);
 angular.module('copayApp.services', []);
 angular.module('copayApp.controllers', []);
diff --git a/js/controllers/sidebar.js b/js/controllers/sidebar.js
index 79b8ad859..7606483b9 100644
--- a/js/controllers/sidebar.js
+++ b/js/controllers/sidebar.js
@@ -82,4 +82,15 @@ angular.module('copayApp.controllers').controller('SidebarController',
     // Init socket handlers (with no wallet yet)
     controllerUtils.setSocketHandlers();
 
+    if ($rootScope.wallet) {
+      $scope.$on('$idleStart', function(a) {
+        notification.warning('Session will be closed', 'Your session is about to expire due to inactivity');
+      });
+
+      $scope.$on('$idleTimeout', function() {
+        $scope.signout();
+        notification.warning('Session closed', 'Session closed because a long time of inactivity');
+      });
+    }
+
   });
diff --git a/js/models/core/HDParams.js b/js/models/core/HDParams.js
index 9c84108b9..6f045e679 100644
--- a/js/models/core/HDParams.js
+++ b/js/models/core/HDParams.js
@@ -18,7 +18,7 @@ function HDParams(opts) {
 
 HDParams.init = function(totalCopayers) {
   preconditions.shouldBeNumber(totalCopayers);
-  var ret = [new HDParams()];
+  var ret = [new HDParams({receiveIndex: 1})];
   for (var i = 0 ; i < totalCopayers ; i++) {
     ret.push(new HDParams({copayerIndex: i}));
   }
diff --git a/js/routes.js b/js/routes.js
index 9db46fdc1..00ab8b185 100644
--- a/js/routes.js
+++ b/js/routes.js
@@ -65,17 +65,22 @@ angular
 //Setting HTML5 Location Mode
 angular
   .module('copayApp')
-  .config(function($locationProvider) {
+  .config(function($locationProvider, $idleProvider) {
     $locationProvider
       .html5Mode(false)
       .hashPrefix('!');
+    // IDLE timeout
+    $idleProvider.idleDuration(15 * 60); // in seconds
+    $idleProvider.warningDuration(10); // in seconds
   })
-  .run(function($rootScope, $location) {
+  .run(function($rootScope, $location, $idle) {
+    $idle.watch();
     $rootScope.$on('$routeChangeStart', function(event, next, current) {
       if (!util.supports.data) {
         $location.path('unsupported');
       } else {
         if ((!$rootScope.wallet || !$rootScope.wallet.id) && next.validate) {
+          $idle.unwatch();
           $location.path('/');
         }
         if ($rootScope.wallet && !$rootScope.wallet.isReady()) {
diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js
index ea670355b..57a5faa13 100644
--- a/js/services/controllerUtils.js
+++ b/js/services/controllerUtils.js
@@ -185,13 +185,14 @@ angular.module('copayApp.services')
 
     root.updateAddressList = function() {
       var w = $rootScope.wallet;
-      if (w)
+      if (w && w.isReady())
         $rootScope.addrInfos = w.getAddressesInfo();
     };
 
     root.updateBalance = function(cb) {
       var w = $rootScope.wallet;
       if (!w) return root.onErrorDigest();
+      if (!w.isReady()) return;
 
       $rootScope.balanceByAddr = {};
       $rootScope.updatingBalance = true;
diff --git a/karma.conf.js b/karma.conf.js
index 8bd9d8e1b..fd2c586fe 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -21,6 +21,7 @@ module.exports = function(config) {
       'lib/angular/angular.min.js',
       'lib/angular-mocks/angular-mocks.js',
       'lib/moment/moment.js',
+      'lib/ng-idle/angular-idle.min.js',
       'lib/angular-moment/angular-moment.js',
       'lib/qrcode-generator/js/qrcode.js',
       'lib/angular-qrcode/qrcode.js',
diff --git a/test/mocks/FakeWallet.js b/test/mocks/FakeWallet.js
index 4c043395e..945e584e9 100644
--- a/test/mocks/FakeWallet.js
+++ b/test/mocks/FakeWallet.js
@@ -46,6 +46,10 @@ FakeWallet.prototype.getAddressesInfo = function() {
   return ret;
 };
 
+FakeWallet.prototype.isReady = function() {
+  return true;
+}
+
 
 FakeWallet.prototype.getBalance = function(cb) {
   return cb(null, this.balance, this.balanceByAddr, this.safeBalance);
diff --git a/test/test.PublicKeyRing.js b/test/test.PublicKeyRing.js
index 088c1f819..41d874676 100644
--- a/test/test.PublicKeyRing.js
+++ b/test/test.PublicKeyRing.js
@@ -145,9 +145,8 @@ describe('PublicKeyRing model', function() {
     var k = createW();
     var w = k.w;
 
-
     var a = w.getAddresses();
-    a.length.should.equal(0);
+    a.length.should.equal(1);
 
     [true, false].forEach(function(isChange){
       for (var i = 0; i < 2; i++) {
@@ -156,15 +155,22 @@ describe('PublicKeyRing model', function() {
     });
 
     var as = w.getAddressesInfo();
-    as.length.should.equal(4);
+    as.length.should.equal(5); // include pre-generated shared one
     for (var j in as) {
       var a = as[j];
       a.address.isValid().should.equal(true);
       a.addressStr.should.equal(a.address.toString());
-      a.isChange.should.equal([false, false, true, true][j]);
+      a.isChange.should.equal([false, false, false, true, true][j]);
     }
   });
 
+
+  it('should start with one shared address', function() {
+    var k = createW();
+    var a = k.w.getAddresses();
+    a.length.should.equal(1);
+  });
+
   it('should count generation indexes', function() {
     var k = createW();
     var w = k.w;
diff --git a/test/test.Wallet.js b/test/test.Wallet.js
index 46cc15cd8..04b1626de 100644
--- a/test/test.Wallet.js
+++ b/test/test.Wallet.js
@@ -594,7 +594,7 @@ describe('Wallet model', function() {
 
 
   it('should get balance', function(done) {
-    var w = createW();
+    var w = createW2();
     var spy = sinon.spy(w.blockchain, 'getUnspent');
     w.blockchain.fixUnspent([]);
     w.getBalance(function(err, balance, balanceByAddr, safeBalance) {
diff --git a/views/join.html b/views/join.html
index 179d89f48..dff6317c2 100644
--- a/views/join.html
+++ b/views/join.html
@@ -11,7 +11,15 @@
         <div class="box-setup">
           <h1 class="text-primary line-sidebar-b">Join a Wallet in Creation</h1>
           <form name="joinForm" ng-submit="join(joinForm)" novalidate>
-            <label for="connectionId"> Wallet Setting </label>
+
+            <label for="connectionId"> Wallet Setting 
+              <small class="has-error" ng-show="joinForm.connectionId.$invalid
+                && !joinForm.connectionId.$pristine">Wallet Secret is not valid!</small>
+              <small data-options="disable_for_touch:true"
+                ng-show="joinForm.connectionId.$pristine" class="has-tip
+                text-gray" tooltip="Paste wallet secret here" >Required</small>
+            </label>
+
             <input id="connectionId" type="text" class="small-9 columns" placeholder="Paste wallet secret here" name="connectionId" ng-model="connectionId" wallet-secret required style="width:85%;">
             <div class="small-2 columns" style="padding:0px;width:15%;" ng-hide="showScanner">
                 <a class="postfix button primary" ng-click="openScanner()"><i class="fi-camera">&nbsp;</i></a>
diff --git a/views/modals/qr-address.html b/views/modals/qr-address.html
index f51b13e1f..d64a997b1 100644
--- a/views/modals/qr-address.html
+++ b/views/modals/qr-address.html
@@ -1,6 +1,6 @@
 <div class="text-center">
   <qrcode size="250" data="{{address.address}}"></qrcode>
-  
+
   <div class="m10t">
     <h4>{{address.address}}</h4>
     <span ng-if="$root.updatingBalance">