diff --git a/www/views/tab-create-shared.html b/www/views/tab-create-shared.html
index edd6f8175..b2a6a221c 100644
--- a/www/views/tab-create-shared.html
+++ b/www/views/tab-create-shared.html
@@ -65,7 +65,7 @@
             <div class="input-label" translate>
               Wallet Key
             </div>
-            <select class="m10t" ng-model="seedSource" ng-options="seed as seed.label for seed in seedOptions"></select>
+            <select class="m10t" ng-model="seedSource" ng-options="seed as seed.label for seed in seedOptions" ng-change="resizeView()"></select>
           </label>
 
           <label class="item item-input item-stacked-label" ng-show="seedSource.id == 'trezor' || seedSource.id == 'ledger'">
@@ -96,20 +96,41 @@
                    placeholder="{{'Password'|translate}}"
                    type="password"
                    autocapitalize="off"
-                   ng-model="formData.createPassphrase">
+                   ng-model="formData.createPassphrase"
+                   ng-change="checkPassword(formData.createPassphrase, formData.repeatpassword)"
+                   ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
 
             <input ng-show="seedSource.id == 'set'"
                    placeholder="{{'Password'|translate}}"
                    type="password"
                    autocapitalize="off"
-                   ng-model="formData.passphrase">
+                   ng-model="formData.passphrase"
+                   ng-change="checkPassword(formData.passphrase, formData.repeatpassword)"
+                   ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
+          </div>
+          <div class="item item-input" ng-show="encrypt">
+            <input ng-show="seedSource.id == 'new'"
+                   placeholder="{{'Repeat password'|translate}}"
+                   type="password"
+                   autocapitalize="off"
+                   ng-model="formData.repeatpassword"
+                   ng-change="checkPassword(formData.createPassphrase, formData.repeatpassword)"
+                   ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
+
+             <input ng-show="seedSource.id == 'set'"
+                    placeholder="{{'Repeat password'|translate}}"
+                    type="password"
+                    autocapitalize="off"
+                    ng-model="formData.repeatpassword"
+                    ng-change="checkPassword(formData.passphrase, formData.repeatpassword)"
+                    ng-class="{'correct': result == 'correct', 'incorrect': result == 'incorrect'}">
           </div>
 
           <div class="text-center box-notification error" ng-show="(seedSource.id =='new' || seedSource.id =='set') && encrypt">
             <strong translate>This password cannot be recovered. If the password is lost, there is no way you could recover your funds.</strong>
           </div>
 
-          <ion-checkbox ng-model="formData.passwordSaved" class="checkbox-positive" ng-show="encrypt">
+          <ion-checkbox ng-model="formData.passwordSaved" class="checkbox-positive" ng-show="encrypt && result == 'correct'">
             <span class="toggle-label" translate>I have written it down</span>
           </ion-checkbox>