diff --git a/index.html b/index.html
index 8ebc2f12c..f5d0c1db6 100644
--- a/index.html
+++ b/index.html
@@ -64,17 +64,6 @@
           Connecting to wallet...
         </div>
         <div ng-show="!loading">
-          <div class="row">
-            <div class="large-6 columns">
-              <h3>Open a Existing Wallet</h3>
-              <select class="form-control" ng-model="selectedWalletId" ng-options="walletId for walletId in listWalletIds()">
-              </select>
-            </div>
-            <div class="large-3 columns">
-              <button class="button primary expand round" type="button" ng-click="open(selectedWalletId)">Open</button>
-            </div>
-          </div>
-          <hr>
           <div class="row">
             <div class="large-6 columns">
               <h3>Join a Network Wallet</h3>
@@ -85,14 +74,35 @@
             </div>
           </div>
           <hr>
-          <div class="row">
-            <div class="large-6 columns">
-              <h3>Create a New Wallet</h3>
-            </div>
-            <div class="large-3 columns">
-              <button class="button secondary expand round" ng-click="create()">Create</button>
+          <div ng-show="walletIds.length === 0">
+            <div class="row">
+              <div class="large-6 columns">
+                <h3>Create a New Wallet</h3>
+              </div>
+              <div class="large-3 columns">
+                <button class="button secondary expand round" ng-click="create()">Create</button>
+              </div>
             </div>
           </div>
+          <div ng-show="walletIds.length>0">
+            <div class="row">
+              <div class="large-6 columns">
+                <h3>Open a Existing Wallet</h3>
+                <select class="form-control" ng-model="selectedWalletId" ng-options="walletId for walletId in walletIds">
+                </select>
+              </div>
+              <div class="large-3 columns">
+                <button class="button primary expand round" type="button" ng-click="open(selectedWalletId)">Open</button>
+              </div>
+            </div>
+            <div class="row">
+              <div class="text-center">
+                <a ng-click="create()">Or create a new wallet</a>
+              </div>
+            </div>
+          </div>
+          <hr>
+
         </div>
       </div>
     </script>
@@ -127,6 +137,11 @@
               </button>
             </div>
           </div>
+          <div class="row">
+            <div class="text-center">
+              <a href="#signin">Go back</a>
+            </div>
+          </div>
         </div>
       </div>
     </script>
@@ -152,11 +167,11 @@
           </ul>
         </div>
         <div class="large-6 columns p70l">
-          <h3 class="panel-title">Copayers ({{$root.wallet.network.connectedPeers.length}}/{{$root.wallet.publicKeyRing.requiredCopayers}})</h3>
+          <h3 class="panel-title">Online Copayers: {{$root.wallet.network.connectedPeers.length}}</h3>
           <ul class="no-bullet">
             <li class="panel" ng-repeat="copayer in $root.wallet.network.connectedPeers">
-              <span ng-if="copayer == $root.peerId"> You ({{$root.peerId}})<i class="fi-check size-24"></i></span>
-              <span ng-if="copayer != $root.peerId">{{copayer}}</span>
+              <span ng-if="copayer == $root.wallet.network.peerId"> You ({{copayer}})<i class="fi-check size-24"></i></span>
+              <span ng-if="copayer !== $root.wallet.network.peerId">{{copayer}}</span>
               <span>
                   <i class="fi-check size-16 panel-sign right p5h br100"></i>
               </span>
diff --git a/js/controllers/signin.js b/js/controllers/signin.js
index a636dbab2..2e571f328 100644
--- a/js/controllers/signin.js
+++ b/js/controllers/signin.js
@@ -9,11 +9,8 @@ angular.module('copay.signin').controller('SigninController',
 //    $rootScope.peerId = peerData ? peerData.peerId : null;
     $scope.loading = false;
 
-    $scope.selectedWalletId = false;
-
-    $scope.listWalletIds = function() {
-      return walletFactory.getWalletIds();
-    };
+    $scope.walletIds = walletFactory.getWalletIds();
+    $scope.selectedWalletId = $scope.walletIds?$scope.walletIds.shift():null;
 
     $scope.create = function() {
       $location.path('setup');
diff --git a/js/models/core/WalletFactory.js b/js/models/core/WalletFactory.js
index a871b4968..bd87ec1fd 100644
--- a/js/models/core/WalletFactory.js
+++ b/js/models/core/WalletFactory.js
@@ -156,7 +156,6 @@ WalletFactory.prototype.openRemote = function(peedId) {
   opts.totalCopayers = totalCopayers;
   var w   = new Wallet(opts);
   w.store();
-  this.addWalletId(w.id);
   return w;
 };