diff --git a/index.html b/index.html
index 618718936..794b6d70b 100644
--- a/index.html
+++ b/index.html
@@ -147,8 +147,9 @@
               <div class="box-signin">
                 <h3>Join a Wallet in Creation</h3>
                 <input type="text" class="form-control" placeholder="Paste wallet secret here" ng-model="connectionId" required autofocus>
+                <input type="password" class="form-control" placeholder="Your wallet password" ng-model="joinPassword">
                 <input type="text" class="form-control" placeholder="Your name (optional)" ng-model="nickname">
-                <button class="button primary expand radius" ng-click="join(connectionId,nickname)" ng-disabled="loading" loading="Joining">Join</button>
+                <button class="button primary expand radius" ng-click="join()" ng-disabled="loading" loading="Joining">Join</button>
               </div>
             </div>
             <div class="large-6 columns">
@@ -157,12 +158,14 @@
                   <h3>Open Wallet</h3>
                   <select class="form-control" ng-model="selectedWalletId" ng-options="w.id as w.show for w in wallets">
                   </select>
-                  <button class="button secondary expand radius" type="button" ng-click="open(selectedWalletId)" ng-disabled="loading" loading="Opening">Open</button>
+                  <input type="password" class="form-control" placeholder="Your wallet password" ng-model="openPassword">
+                  <button class="button secondary expand radius" type="button" ng-click="open()" ng-disabled="loading" loading="Opening">Open</button>
                 </div>
                 <div ng-show="!wallets.length">
                   <h3>Create a new wallet</h3>
                   <input type="text" class="form-control" ng-model="walletName" placeholder="Wallet name (optional)">
-                  <button class="button secondary expand radius" ng-click="create(walletName)" ng-disabled="loading" loading="Creating">Create</button> 
+                  <input type="password" class="form-control" placeholder="Your wallet password" ng-model="createPassword">
+                  <button class="button secondary expand radius" ng-click="create()" ng-disabled="loading" loading="Creating">Create</button> 
                 </div>
               </div>
             </div>
@@ -176,8 +179,6 @@
               <a ng-href="#import">Import from file</a>
             </div>
           </div>
-          
-
         </div> <!-- End !loading -->
       </div>
     </script>
@@ -185,7 +186,6 @@
     <script type="text/ng-template" id="import.html">
       <div ng-controller="ImportController">
         <h3>{{title}}</h3>
-
         <div class="large-6 columns">
           <input type="file" class="form-control" placeholder="Select a backup file" ng-model="backupFile" autofocus="" ng-file-select>
         </div>
@@ -202,14 +202,12 @@
             <div class="small-12 medium-8 medium-centered large-8 large-centered columns box-setup">
             <div class="large-6 columns line-dashed-v">
               <h6>Select total number of copayers</h6>
-              <select ng-model="totalCopayers" 
-                ng-options="totalCopayers as totalCopayers for totalCopayers in TCValues">
+              <select ng-model="totalCopayers" ng-options="totalCopayers as totalCopayers for totalCopayers in TCValues">
               </select>
             </div>
             <div class="large-6 columns">
               <h6>Select required number of signatures</h6>
-              <select ng-model="requiredCopayers" 
-                ng-options="requiredCopayers as requiredCopayers for requiredCopayers in RCValues">
+              <select ng-model="requiredCopayers" ng-options="requiredCopayers as requiredCopayers for requiredCopayers in RCValues">
               </select>
             </div>
           </div>
@@ -221,28 +219,23 @@
                 </div>
               </div>
             </div>
-          </div>
-
-          <div class="row">
             <div class="small-12 medium-6 medium-centered large-6 large-centered columns m30v">
               <h6>Wallet Password</h6>
-                <input type="password" ng-model="walletPassword" placeholder="My wallet password" class="form-control" required>
+              <input type="password" class="form-control" ng-model="walletPassword" required>
             </div>
-          </div>
-          <div class="row">
             <div class="small-12 medium-6 medium-centered large-6 large-centered columns m30v">
-              <h6>Wallet name (optional)</h6>
-                <input type="text" class="form-control" ng-model="walletName" placeholder="Enter wallet name">
+              <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 (optional)</h6>
-                <input ng-model="myNickname" placeholder="" class="size-24" style="width:100%">
+              <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(totalCopayers, requiredCopayers, walletName, myNickname)">
+               ng-click="create()">
                Create {{requiredCopayers}}-of-{{totalCopayers}} wallet
               </button>
               <a class="button secondary radius" href="#signin">Go back</a>
@@ -252,16 +245,6 @@
       </div>
     </script>
 
-    <script type="text/ng-template" id="password.html">
-      <div class="" ng-controller="PasswordController">
-        <h3>Enter your password</h3>
-        <div class="large-6 columns">
-          <input type="password" class="form-control" placeholder="Enter your passwor" ng-model="password" autofocus required>
-          <button type="submit" class="button secondary round text-center" ng-click="getPassphrase()">Send</button>
-        </div>
-      </div>
-    </script>
-
     <script type="text/ng-template" id="peer.html">
       <div class="row"  ng-if="$root.wallet.requiredCopayers > $root.wallet.network.connectedCopayers().length">
         <div class="large-12 columns p70l">
@@ -598,7 +581,6 @@
     <script src="js/controllers/signin.js"></script>
     <script src="js/controllers/setup.js"></script>
     <script src="js/controllers/import.js"></script>
-    <script src="js/controllers/password.js"></script>
 
     <script src="js/init.js"></script>
   </body>
diff --git a/js/app.js b/js/app.js
index 060a2103c..db15e356c 100644
--- a/js/app.js
+++ b/js/app.js
@@ -21,7 +21,6 @@ var copayApp = window.copayApp = angular.module('copay',[
   'copay.directives',
   'copay.video',
   'copay.import',
-  'copay.password',
   'copay.passphrase'
 ]);
 
@@ -39,6 +38,5 @@ angular.module('copay.socket', []);
 angular.module('copay.directives', []);
 angular.module('copay.video', []);
 angular.module('copay.import', []);
-angular.module('copay.password', []);
 angular.module('copay.passphrase', []);
 
diff --git a/js/routes.js b/js/routes.js
index 154d1c614..36ed4654b 100644
--- a/js/routes.js
+++ b/js/routes.js
@@ -22,10 +22,6 @@ angular
         templateUrl: 'setup.html',
         validate: false
       })
-      .when('/password', {
-        templateUrl: 'password.html',
-        validate: false
-      })
       .when('/addresses', {
         templateUrl: 'addresses.html',
         validate: true