diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index e695a028aaa..da9f0d05a6f 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-6974
\ No newline at end of file
+6975
\ No newline at end of file
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 d9769cfa3b1..fa8a53a4ae1 100644
--- a/mozilla/webtools/bugzilla/template/en/default/attachment/edit.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/attachment/edit.html.tmpl
@@ -160,6 +160,7 @@
             [% PROCESS "flag/list.html.tmpl" bug_id = attachment.bug_id
                                              attach_id = attachment.id
                                              flag_types = attachment.flag_types
+                                             read_only_flags = !can_edit
             %]
           </div>
         [% END %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/flag/list.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/flag/list.html.tmpl
index adf12565c23..c0bffd704d7 100644
--- a/mozilla/webtools/bugzilla/template/en/default/flag/list.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/flag/list.html.tmpl
@@ -18,7 +18,7 @@
   # Contributor(s): Myk Melez <myk@mozilla.org>
   #%]
 
-[% IF user.id %]
+[% IF user.id AND !read_only_flags %]
 
 [%# We list flags by looping twice over the flag types relevant for the bug.
   # In the first loop, we display existing flags and then, for active types,