diff --git a/js/controllers/signin.js b/js/controllers/signin.js
index 5971a1ce2..685e176d5 100644
--- a/js/controllers/signin.js
+++ b/js/controllers/signin.js
@@ -2,8 +2,13 @@
 
 angular.module('copay.signin').controller('SigninController',
   function($scope, $rootScope, $location, walletFactory, controllerUtils, Passphrase) {
+    var cmp = function(o1, o2){
+      var v1 = o1.show.toLowerCase(), v2 = o2.show.toLowerCase();
+      return v1 > v2 ? 1 : ( v1 < v2 ) ? -1 : 0;
+    };
+
     $scope.loading = false;
-    $scope.wallets = walletFactory.getWallets();
+    $scope.wallets = walletFactory.getWallets().sort(cmp);
     $scope.selectedWalletId = $scope.wallets.length ? $scope.wallets[0].id : null;
     $scope.openPassword = '';
 
diff --git a/js/models/storage/LocalEncrypted.js b/js/models/storage/LocalEncrypted.js
index 42509ab6b..18fc83dee 100644
--- a/js/models/storage/LocalEncrypted.js
+++ b/js/models/storage/LocalEncrypted.js
@@ -73,7 +73,8 @@ Storage.prototype._write = function(k,v) {
 
 // get value by key
 Storage.prototype.getGlobal = function(k) {
-  return  localStorage.getItem(k);
+  var item = localStorage.getItem(k);
+  return item == 'undefined' ? undefined : item;
 };
 
 // set value for key