diff --git a/po/es.po b/po/es.po
index 038cb2993..0e8aa2757 100644
--- a/po/es.po
+++ b/po/es.po
@@ -740,10 +740,12 @@ msgstr "Faltan {{tx.missingSignatures}} firmas"
 #~ "                monedero"
 
 #: views/create.html
-msgid "Please enter the same password you entered above"
-msgstr "Por favor ingrese la misma contraseña ingresada arriba"
+msgid "Passwords must match"
+msgstr "Las contraseñas deben coincidir"
 
 #: views/join.html
-msgid "Please enter the same password you entered above"
-msgstr "Por favor ingrese la misma contraseña ingresada arriba"
+msgid "Passwords must match"
+msgstr "Las contraseñas deben coincidir"
+
+
 
diff --git a/views/create.html b/views/create.html
index ca7a897c1..f1a2f5178 100644
--- a/views/create.html
+++ b/views/create.html
@@ -24,17 +24,23 @@
                 <input id="Name" type="text" placeholder="{{'Name'|translate}}" class="form-control" ng-model="$parent.myNickname">
               </div>
               <div>
-                <label for="walletPassword"><span translate>Your Wallet Password</span> 
-                  <small translate data-options="disable_for_touch:true" class="has-tip text-gray" tooltip="doesn't need to be shared">Required</small>
+                <label for="walletPassword">
+                  <span translate>Your Password</span> 
                 </label>
-                <input id="walletPassword" type="password" placeholder="{{'Choose your password'|translate}}" class="form-control" ng-model="$parent.walletPassword" name="walletPassword" check-strength="passwordStrength" tooltip-html-unsafe="Password strength: 
+                <input id="walletPassword" type="password" placeholder="{{'Choose a password'|translate}}" class="form-control" ng-model="$parent.walletPassword" name="walletPassword" check-strength="passwordStrength" tooltip-html-unsafe="Password strength: 
                   <i>{{passwordStrength}}</i><br/><span
                     class='size-12'>Tip: Use lower and uppercase, numbers and
                     symbols</span>" tooltip-trigger="focus" required tooltip-placement="top">
-                <small translate class="is-valid" ng-show="setupForm.walletPasswordConfirm.$dirty && setupForm.$invalid">Please enter the same password you entered above</small>
-                <input type="password" placeholder="{{'Repeat password'|translate}}" name="walletPasswordConfirm" ng-model="walletPasswordConfirm" match="walletPassword" required>
+                <div class="pr">
+                  <input type="password" placeholder="{{'Repeat password'|translate}}" name="walletPasswordConfirm" ng-model="walletPasswordConfirm" match="walletPassword" required>
+                  <small class="icon-input" ng-show="setupForm.walletPasswordConfirm.$dirty && setupForm.$invalid"><i class="fi-x"></i></small>
+                  <p translate class="m15b text-gray size-12" ng-show="setupForm.walletPasswordConfirm.$dirty && setupForm.$invalid">
+                    <i class="fi-x m5r"></i>
+                    Passwords must match
+                  </p>
+                </div>
 
-                <div class="text-left">
+                <div class="text-left line-sidebar-t">
                   <input id="network-name" type="checkbox" ng-model="networkName" ng-true-value="testnet" ng-false-value="livenet" class="form-control" ng-click="changeNetwork()" ng-checked="networkName == 'testnet' ? true : false">
                   <label for="network-name">Use test network</label>
                 </div>
diff --git a/views/join.html b/views/join.html
index 7e58dba5d..d11b34edf 100644
--- a/views/join.html
+++ b/views/join.html
@@ -22,9 +22,13 @@
             </label>
             
             <div class="row collapse">
-              <div class="large-10 medium-10 small-10 columns">
+              <div class="large-10 medium-10 small-10 columns pr">
                 <input id="connectionId" type="text" class="small-9 columns" 
                 placeholder="{{'Paste wallet secret here'|translate}}" name="connectionId" ng-model="connectionId" wallet-secret required>
+                <small class="icon-input" ng-show="joinForm.connectionId.$invalid
+                && !joinForm.connectionId.$pristine"><i class="fi-x"></i></small>
+                <small class="icon-input" ng-show="joinForm.connectionId.$valid
+                && !joinForm.connectionId.$pristine"><i class="fi-check"></i></small>
               </div>
               <div class="small-2 columns" ng-hide="showScanner || disableScanner">
                   <a class="postfix button primary" ng-click="openScanner()"><i class="fi-camera">&nbsp;</i></a>
@@ -64,13 +68,20 @@
               numbers and symbols</span>" tooltip-trigger="focus" 
               tooltip-placement="top" required>
 
-            <small translate class="is-valid" ng-show="joinForm.joinPasswordConfirm.$dirty &&  joinForm.$invalid">Please enter the same password you entered above</small>
-            <input type="password" 
-            placeholder="{{'Repeat password'|translate}}"
-            name="joinPasswordConfirm"
-            ng-model="joinPasswordConfirm" 
-            match="joinPassword" required>
-            <a class="expand small left"  ng-click="hideAdv=!hideAdv">
+            <div class="pr line-sidebar-b">
+              <input type="password" 
+              placeholder="{{'Repeat password'|translate}}"
+              name="joinPasswordConfirm"
+              ng-model="joinPasswordConfirm" 
+              match="joinPassword" required>
+              <small class="icon-input" ng-show="joinForm.joinPasswordConfirm.$dirty && joinForm.joinPasswordConfirm.$invalid"><i class="fi-x"></i></small>
+              <p translate class="m15b text-gray size-12" ng-show="joinForm.joinPasswordConfirm.$dirty && joinForm.joinPasswordConfirm.$invalid">
+                <i class="fi-x m5r"></i>
+                {{'Passwords must match'|translate}}
+              </p>
+            </div>
+
+            <a class="expand small"  ng-click="hideAdv=!hideAdv">
               <span translate ng-hide="!hideAdv">Show</span> 
               <span translate ng-hide="hideAdv">Hide</span> 
               <span translate>advanced options</span>