diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 74ad95528db..6582744d854 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-8714
\ No newline at end of file
+8715
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/template/en/default/attachment/create.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/attachment/create.html.tmpl
index 8f5477e2302..abc0f97bf13 100644
--- a/mozilla/webtools/bugzilla/template/en/default/attachment/create.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/attachment/create.html.tmpl
@@ -92,7 +92,7 @@ TUI_hide_default('attachment_text_field');
           cols    = constants.COMMENT_COLS
           wrap    = 'soft'
         %]
-        [% IF NOT bug.cc || NOT bug.cc.contains(user.login) %]
+        [% IF NOT bug.cc.contains(user.login) %]
           <br>
           <input type="checkbox" id="addselfcc" name="addselfcc"
             [%~ ' checked="checked"'
diff --git a/mozilla/webtools/bugzilla/template/en/default/attachment/edit.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/attachment/edit.html.tmpl
index 67dcabd7563..518737788ac 100644
--- a/mozilla/webtools/bugzilla/template/en/default/attachment/edit.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/attachment/edit.html.tmpl
@@ -255,7 +255,7 @@
               wrap    = 'soft'
               classes = classNames
             %]
-            [% IF NOT attachment.bug.cc || NOT attachment.bug.cc.contains(user.login) %]
+            [% IF NOT attachment.bug.cc.contains(user.login) %]
               <input type="checkbox" id="addselfcc" name="addselfcc"
                 [%~ ' checked="checked"'
                     IF user.settings.state_addselfcc.value == 'always'
diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/edit.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/edit.html.tmpl
index 54e1cdb7afd..683d6ed4a7f 100644
--- a/mozilla/webtools/bugzilla/template/en/default/bug/edit.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/bug/edit.html.tmpl
@@ -738,7 +738,7 @@
       </th>
       <td>
         [% IF user.id %]
-          [% IF NOT bug.cc || NOT bug.cc.contains(user.login) %]
+          [% IF NOT bug.cc.contains(user.login) %]
             <input type="checkbox" id="addselfcc" name="addselfcc"
               [% " checked=\"checked\""
                    IF user.settings.state_addselfcc.value == 'always'
@@ -748,7 +748,7 @@
             <br> 
           [% END %]
         [% END %]
-        [% bug.cc.size || 0  FILTER html %] 
+        [% bug.cc.size FILTER html %] 
         [% IF bug.cc.size == 1 %]
           user
         [% ELSE %]
@@ -779,7 +779,7 @@
                 %]
             </div>
           [% END %]
-          [% IF bug.cc %]
+          [% IF bug.cc.size %]
             <select id="cc" multiple="multiple" size="5"
               [% IF bug.user.canedit %]name="cc"[% END %]>
               [% FOREACH c = bug.cc %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/show-multiple.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/show-multiple.html.tmpl
index a20daedfaa9..e55a7cad447 100644
--- a/mozilla/webtools/bugzilla/template/en/default/bug/show-multiple.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/bug/show-multiple.html.tmpl
@@ -76,7 +76,7 @@
       [% rightcells.push('qa_contact') %]
     [% END %]
     [% rightcells.push('') %]
-    [% IF bug.cc %]
+    [% IF bug.cc.size %]
       [% rightcells.push('cc') %]
     [% END %]
     [% IF bug.keywords %]