diff --git a/index.html b/index.html
index 7f5ca539d..290761b4b 100644
--- a/index.html
+++ b/index.html
@@ -209,6 +209,7 @@
           Creating new wallet...
         </div>
         <div ng-show="!loading">
+          <form name="setupForm" ng-submit="create(setupForm)" novalidate>
           <div class="row">
             <div class="small-12 medium-8 medium-centered large-8 large-centered columns box-setup">
               <div class="large-6 columns line-dashed-v">
@@ -232,27 +233,27 @@
               </div>
             </div>
             <div class="small-12 medium-6 medium-centered large-6 large-centered columns m30v">
-              <h6>Wallet Password</h6>
+              <h6>Wallet Password <small>Required</small></h6>
               <input type="password" class="form-control" ng-model="walletPassword" required>
             </div>
             <div class="small-12 medium-6 medium-centered large-6 large-centered columns m30v">
-              <h6>Wallet name <small>(optional)</small></h6>
+              <h6>Wallet name <small>Optional</small></h6>
                 <input type="text" class="form-control" ng-model="walletName">
             </div>
             <div class="large-6 large-centered columns m30v">
-              <h6>Your name <small>(optional)</small></h6>
+              <h6>Your name <small>Optional</small></h6>
                 <input type="text" class="form-control" ng-model="myNickname">
             </div>
           </div>
           <div class="row">
             <div class="large-12 columns line-dashed">
-              <button class="button primary radius right" type="button"
-               ng-click="create()">
+              <button type="submit" class="button primary radius right" ng-disabled="setupForm.$invalid || loading">
                Create {{requiredCopayers}}-of-{{totalCopayers}} wallet
               </button>
               <a class="button secondary radius" href="#signin">Go back</a>
             </div>
           </div>
+          </form>
         </div>
       </div>
     </script>
diff --git a/js/controllers/setup.js b/js/controllers/setup.js
index 1da4404e4..bd5116dad 100644
--- a/js/controllers/setup.js
+++ b/js/controllers/setup.js
@@ -32,7 +32,12 @@ angular.module('copay.setup').controller('SetupController',
       updateRCSelect(tc);
     });
 
-    $scope.create = function() {
+    $scope.create = function(form) {
+      if (form && form.$invalid) {
+        $rootScope.flashMessage = { message: 'Please, enter required fields', type: 'error'};
+        return;
+      }
+
       $scope.loading = true;
 
       var passphrase = Passphrase.getBase64($scope.walletPassword);