diff --git a/www/views/join.html b/www/views/join.html
index 559cecef6..a62496124 100644
--- a/www/views/join.html
+++ b/www/views/join.html
@@ -82,27 +82,29 @@
                    ng-model="privateKey">
           </label>
 
-          <ion-toggle ng-model="encrypt" toggle-class="toggle-positive" ng-change="resizeView()" ng-show="join.seedSourceId == 'new' || join.seedSourceId == 'set'">
-            <span translate>Encrypt with a Password</span>
+          <ion-toggle class="has-comment" ng-model="encrypt" toggle-class="toggle-positive" ng-change="resizeView()" ng-show="join.seedSourceId == 'new' || join.seedSourceId == 'set'">
+            <span class="toggle-label" translate>Add a password</span>
           </ion-toggle>
+          <div class="comment">
+            <span ng-show="join.seedSourceId == 'new'" translate>Add an optional password to secure the recovery phrase</span>
+            <span ng-show="join.seedSourceId == 'set'" translate>The recovery phrase could require a password to be imported</span>
+          </div>
 
-          <label class="item item-input item-stacked-label" ng-show="join.seedSourceId == 'new' && encrypt">
-            <span class="input-label" translate>Add a Password</span>
-            <input type="password"
-            placeholder="{{'Add an optional password to secure the recovery phrase'|translate}}"
-            autocapitalize="off"
-            name="createPassphrase"
-            ng-model="createPassphrase">
-          </label>
+          <div class="item item-input" ng-show="encrypt">
+            <input ng-show="join.seedSourceId == 'new'" 
+                   placeholder="{{'Password'|translate}}"
+                   type="password"
+                   autocapitalize="off"
+                   name="createPassphrase"
+                   ng-model="createPassphrase">
 
-          <label class="item item-input item-stacked-label" ng-show="join.seedSourceId == 'set' && encrypt">
-            <span class="input-label" translate>Add a Password</span>
-            <input type="password"
-                   placeholder="{{'The recovery phrase could require a password to be imported'|translate}}"
+            <input ng-show="join.seedSourceId == 'set'" 
+                   placeholder="{{'Password'|translate}}"
+                   type="password"
                    autocapitalize="off"
                    name="passphrase"
                    ng-model="passphrase">
-          </label>
+          </div>
 
           <div class="text-center box-notification error" ng-show="(join.seedSourceId =='new' || join.seedSourceId =='set') && encrypt">
             <strong translate>This password cannot be recovered. If the password is lost, there is no way you could recover your funds.</strong>
diff --git a/www/views/tab-create-personal.html b/www/views/tab-create-personal.html
index 45dba8c14..2bc8bcaf6 100644
--- a/www/views/tab-create-personal.html
+++ b/www/views/tab-create-personal.html
@@ -51,25 +51,27 @@
             ng-model="formData.privateKey">
           </label>
 
-          <ion-toggle ng-model="encrypt" toggle-class="toggle-positive" ng-change="resizeView()" ng-show="seedSource.id == 'new' || seedSource.id == 'set'">
-            <span translate>Encrypt with a Password</span>
+          <ion-toggle class="has-comment" ng-model="encrypt" toggle-class="toggle-positive" ng-change="resizeView()" ng-show="seedSource.id == 'new' || seedSource.id == 'set'">
+            <span class="toggle-label" translate>Add a password</span> 
           </ion-toggle>
+          <div class="comment">
+            <span ng-show="seedSource.id == 'new'" translate>Add an optional password to secure the recovery phrase</span>
+            <span ng-show="seedSource.id == 'set'" translate>The recovery phrase could require a password to be imported</span>
+          </div>
 
-          <label class="item item-input item-stacked-label" ng-show="seedSource.id == 'new' && encrypt">
-            <span class="input-label" translate>Add a Password</span>
-            <input type="password"
-            placeholder="{{'Add an optional password to secure the recovery phrase'|translate}}"
-            autocapitalize="off"
-            ng-model="formData.createPassphrase">
-          </label>
+          <div class="item item-input" ng-show="encrypt">
+            <input ng-show="seedSource.id == 'new'" 
+                   placeholder="{{'Password'|translate}}"
+                   type="password"
+                   autocapitalize="off"
+                   ng-model="formData.createPassphrase">
 
-          <label class="item item-input item-stacked-label" ng-show="seedSource.id == 'set' && encrypt">
-            <span class="input-label" translate>Add a Password</span>
-            <input type="password"
-            placeholder="{{'The recovery phrase could require a password to be imported'|translate}}"
-            autocapitalize="off"
-            ng-model="formData.passphrase">
-          </label>
+            <input ng-show="seedSource.id == 'set'" 
+                   placeholder="{{'Password'|translate}}"
+                   type="password"
+                   autocapitalize="off"
+                   ng-model="formData.passphrase">
+          </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>
diff --git a/www/views/tab-create-shared.html b/www/views/tab-create-shared.html
index e3805579b..ebc5aff4d 100644
--- a/www/views/tab-create-shared.html
+++ b/www/views/tab-create-shared.html
@@ -81,25 +81,27 @@
             ng-model="formData.privateKey">
           </label>
 
-          <ion-toggle ng-model="encrypt" toggle-class="toggle-positive" ng-change="resizeView()" ng-show="seedSource.id == 'new' || seedSource.id == 'set'">
-            <span translate>Encrypt with a Password</span>
+          <ion-toggle class="has-comment" ng-model="encrypt" toggle-class="toggle-positive" ng-change="resizeView()" ng-show="seedSource.id == 'new' || seedSource.id == 'set'">
+            <span class="toggle-label" translate>Add a password</span> 
           </ion-toggle>
+          <div class="comment">
+            <span ng-show="seedSource.id == 'new'" translate>Add an optional password to secure the recovery phrase</span>
+            <span ng-show="seedSource.id == 'set'" translate>The recovery phrase could require a password to be imported</span>
+          </div>
 
-          <label class="item item-input item-stacked-label" ng-show="seedSource.id == 'new' && encrypt">
-            <span class="input-label" translate>Add a Password</span>
-            <input type="password"
-            placeholder="{{'Add an optional password to secure the recovery phrase'|translate}}"
-            autocapitalize="off"
-            ng-model="formData.createPassphrase">
-          </label>
+          <div class="item item-input" ng-show="encrypt">
+            <input ng-show="seedSource.id == 'new'" 
+                   placeholder="{{'Password'|translate}}"
+                   type="password"
+                   autocapitalize="off"
+                   ng-model="formData.createPassphrase">
 
-          <label class="item item-input item-stacked-label" ng-show="seedSource.id == 'set' && encrypt">
-            <span class="input-label" translate>Add a Password</span>
-            <input type="password"
-            placeholder="{{'The recovery phrase could require a password to be imported'|translate}}"
-            autocapitalize="off"
-            ng-model="formData.passphrase">
-          </label>
+            <input ng-show="seedSource.id == 'set'" 
+                   placeholder="{{'Password'|translate}}"
+                   type="password"
+                   autocapitalize="off"
+                   ng-model="formData.passphrase">
+          </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>