diff --git a/index.html b/index.html
index 7e1d39cba..3e228dbc6 100644
--- a/index.html
+++ b/index.html
@@ -288,9 +288,8 @@
                   placeholder="Choose your password" name="joinPassword"
                   ng-model="$parent.joinPassword"
                   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-html-unsafe="Strength:
+                  <i>{{passwordStrength}}</i>" tooltip-trigger="focus" required>
                   <button type="submit" class="button primary radius" ng-disabled="joinForm.$invalid || loading" loading="Joining">Join</button>
                 </form>
               </div>
@@ -371,11 +370,9 @@
                     <label>Your Wallet Password <small data-options="disable_for_touch:true" class="has-tip" tooltip="doesn't need to be shared">Required</small>
                     <input type="password" placeholder="Choose your password" class="form-control"
                       ng-model="$parent.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>" 
+                      check-strength="passwordStrength"
+                      tooltip-html-unsafe="Strength:
+                      <i>{{passwordStrength}}</i>"
                       tooltip-trigger="focus" required>
                     </label>
                   </div>
diff --git a/js/directives.js b/js/directives.js
index e5c0502b2..e0e2a2d00 100644
--- a/js/directives.js
+++ b/js/directives.js
@@ -156,63 +156,55 @@ angular.module('copayApp.directives')
       restrict: 'EACM',
       require: 'ngModel',
       link: function(scope, element, attrs) {
-        var strength = {
-          messages: ['very weak', 'weak', 'weak', 'medium', 'strong'],
-          colors: ['#c0392b', '#e74c3c', '#d35400', '#f39c12', '#27ae60'],
-          mesureStrength: function(p) {
-            var force = 0;
-            var regex = /[$-/:-?{-~!"^_`\[\]]/g;
-            var lowerLetters = /[a-z]+/.test(p);
-            var upperLetters = /[A-Z]+/.test(p);
-            var numbers = /[0-9]+/.test(p);
-            var symbols = regex.test(p);
-            var flags = [lowerLetters, upperLetters, numbers, symbols];
-            var passedMatches = flags.filter(function(el) {
-              return !!el;
-            }).length;
 
-            force = 2 * p.length + (p.length >= 10 ? 1 : 0);
-            force += passedMatches * 10;
+        var MIN_LENGTH = 8;
+        var MESSAGES = ['Very Weak', 'Very Weak', 'Weak', 'Medium', 'Strong', 'Very Strong'];
+        var COLOR = ['#dd514c', '#dd514c', '#faa732', '#faa732', '#5eb95e', '#5eb95e'];
 
-            // penality (short password)
-            force = (p.length <= 6) ? Math.min(force, 10) : force;
-
-            // penality (poor variety of characters)
-            force = (passedMatches == 1) ? Math.min(force, 10) : force;
-            force = (passedMatches == 2) ? Math.min(force, 20) : force;
-            force = (passedMatches == 3) ? Math.min(force, 40) : force;
-            return force;
-          },
-          getColor: function(s) {
-            var idx = 0;
-
-            if (s <= 10) {
-              idx = 0;
-            } else if (s <= 20) {
-              idx = 1;
-            } else if (s <= 30) {
-              idx = 2;
-            } else if (s <= 40) {
-              idx = 3;
+        function evaluateMeter(password) {
+          var passwordStrength = 0;
+          var text;
+          if (password.length > 0) passwordStrength = 1;
+          if (password.length >= MIN_LENGTH) {
+            if ((password.match(/[a-z]/)) && (password.match(/[A-Z]/))) {
+              passwordStrength++;
             } else {
-              idx = 4;
+              text = ', add mixed case';
             }
-
-            return {
-              idx: idx + 1,
-              col: this.colors[idx],
-              message: this.messages[idx]
-            };
+            if (password.match(/\d+/)) {
+              passwordStrength++;
+            } else {
+              if (!text) text = ', add numerals';
+            }
+            if (password.match(/.[!,@,#,$,%,^,&,*,?,_,~,-,(,)]/)) {
+              passwordStrength++;
+            } else {
+              if (!text) text = ', add punctuation';
+            }
+            if (password.length > 12) {
+              passwordStrength++;
+            } else {
+              if (!text) text = ', add characters';
+            }
+          } else {
+            text = ', that\'s short';
           }
-        };
+          if (!text) text = '';
+
+          return {
+            strength: passwordStrength,
+            message: MESSAGES[passwordStrength] + text,
+            color: COLOR[passwordStrength]
+          }
+        }
 
         scope.$watch(attrs.ngModel, function(newValue, oldValue) {
           if (newValue && newValue !== '') {
-            var c = strength.getColor(strength.mesureStrength(newValue));
+            var info = evaluateMeter(newValue);
             element.css({
-              'border-color': c.col
+              'border-color': info.color
             });
-            scope[attrs.checkStrength] = c.message;
+            scope[attrs.checkStrength] = info.message;
           }
         });
       }