diff --git a/index.html b/index.html
index 8d308e0d6..7f5ca539d 100644
--- a/index.html
+++ b/index.html
@@ -180,7 +180,7 @@
           <div class="row">
             <div class="large-12 columns text-center line-dashed">
               <span ng-show="wallets.length">
-                <a ng-click="create()">Create a new wallet</a> &middot;
+                <a href="#/setup">Create a new wallet</a> &middot;
               </span>
               <a ng-href="#import">Import from file</a>
             </div>
diff --git a/js/controllers/signin.js b/js/controllers/signin.js
index 6eee392b0..4086e5424 100644
--- a/js/controllers/signin.js
+++ b/js/controllers/signin.js
@@ -8,20 +8,18 @@ angular.module('copay.signin').controller('SigninController',
     $scope.openPassword = '';
 
     $scope.create = function(form) {
-      if (form) {
-        if (form.$invalid) {
-          $rootScope.flashMessage = { message: 'Please, enter required fields', type: 'error'};
-          return;
-        }
-
-        $rootScope.walletName = form.walletName.$modelValue;
-        $rootScope.walletPassword = form.createPassword.$modelValue;
+      if (form && form.$invalid) {
+        $rootScope.flashMessage = { message: 'Please, enter required fields', type: 'error'};
+        return;
       }
+
+      $rootScope.walletName = form.walletName.$modelValue;
+      $rootScope.walletPassword = form.createPassword.$modelValue;
       $location.path('setup');
     };
 
     $scope.open = function(form) {
-      if (form.$invalid) {
+      if (form && form.$invalid) {
         $rootScope.flashMessage = { message: 'Please, enter required fields', type: 'error'};
         return;
       }
@@ -34,7 +32,7 @@ angular.module('copay.signin').controller('SigninController',
     };
 
     $scope.join = function(form) {
-      if (form.$invalid) {
+      if (form && form.$invalid) {
         $rootScope.flashMessage = { message: 'Please, enter required fields', type: 'error'};
         return;
       }