diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 5253684fc..efe200273 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -1,9 +1,10 @@
 class TagsController < ApplicationController
-  before_filter :builder_only, :only => [:edit, :update]
+  before_filter :member_only, :only => [:edit, :update]
   respond_to :html, :xml, :json
 
   def edit
     @tag = Tag.find(params[:id])
+    check_privilege(@tag)
     respond_with(@tag)
   end
 
@@ -26,8 +27,14 @@ class TagsController < ApplicationController
 
   def update
     @tag = Tag.find(params[:id])
+    check_privilege(@tag)
     @tag.update_attributes(params[:tag])
     @tag.update_category_cache_for_all
     respond_with(@tag)
   end
+
+private
+  def check_privilege(tag)
+    raise User::PrivilegeError unless (CurrentUser.is_builder? || tag.post_count <= 50)
+  end
 end
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb
index b5265f261..2e47cddae 100644
--- a/app/views/tags/index.html.erb
+++ b/app/views/tags/index.html.erb
@@ -18,11 +18,11 @@
               <%= link_to(tag.name, posts_path(:tags => tag.name)) %>
             </td>
             <td>
-              <% if CurrentUser.is_builder? %>
+              <% if CurrentUser.is_builder? || tag.post_count <= 50 %>
                 <%= link_to "edit", edit_tag_path(tag) %>
-                <% if tag.post_count < 1_000 %>
-                  | <%= link_to "fix", new_tag_correction_path(:tag_id => tag.id) %>
-                <% end %>
+              <% end %>
+              <% if CurrentUser.is_builder? && tag.post_count < 1_000 %>
+                | <%= link_to "fix", new_tag_correction_path(:tag_id => tag.id) %>
               <% end %>
             </td>
           </tr>