diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 076d30ef50f..1a3c8662d0c 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-9015
\ No newline at end of file
+9016
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/.gitrev b/mozilla/webtools/bugzilla/.gitrev
index 96451acc61d..5d03bd72864 100644
--- a/mozilla/webtools/bugzilla/.gitrev
+++ b/mozilla/webtools/bugzilla/.gitrev
@@ -1 +1 @@
-082cea0bf161689e2c45750d364c87b46dc87089
\ No newline at end of file
+26913cee0717b63ddc350241370b0f49c82a36c9
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/template/en/default/account/email/confirm-new.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/account/email/confirm-new.html.tmpl
index 09509769884..3b98660040a 100644
--- a/mozilla/webtools/bugzilla/template/en/default/account/email/confirm-new.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/account/email/confirm-new.html.tmpl
@@ -17,6 +17,8 @@
            title = title
 %]
 
+[% password_complexity = Param('password_complexity') %]
+
 <p>
   To create your account, you must enter a password in the form below.
   Your email address and Real Name (if provided) will be shown with
@@ -39,7 +41,15 @@
       <th><label for="passwd1">Type your password</label>:</th>
       <td>
         <input type="password" id="passwd1" name="passwd1" value="" required>
-        (minimum [% constants.USER_PASSWORD_MIN_LENGTH FILTER none %] characters)
+        (Password should be a minimum of [% constants.USER_PASSWORD_MIN_LENGTH FILTER none %] characters long
+        [% IF password_complexity == "mixed_letters" %]
+          and must contain at least one UPPER and one lowercase letter
+        [% ELSIF password_complexity == "letters_numbers" %]
+          and must contain at least one UPPER and one lowercase letter and a number
+        [% ELSIF password_complexity == "letters_numbers_specialchars" %] 
+          and must contain at least one letter, a number and a special character
+        [% END ~%]
+        .)
       </td>
     </tr>
     <tr>