diff --git a/app/models/tag.rb b/app/models/tag.rb
index ffe2bb380..0e27d4e6f 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -87,7 +87,7 @@ class Tag < ActiveRecord::Base
         tag = find_by_name(name)
 
         if tag
-          if category > 0 && !(options[:user] && !options[:user].is_privileged? && tag.post_count > 10)
+          if category > 0
             tag.update_column(:category, category)
           end
 
diff --git a/app/views/tags/_secondary_links.html.erb b/app/views/tags/_secondary_links.html.erb
index 6f226f6af..fcfd38b13 100644
--- a/app/views/tags/_secondary_links.html.erb
+++ b/app/views/tags/_secondary_links.html.erb
@@ -2,6 +2,10 @@
   <menu>
     <li><%= link_to "Listing", tags_path %></li>
     <li><%= link_to "Search", search_tags_path %></li>
-    <li><%= link_to "Help", wiki_pages_path(:search => {:title_equals => "help:tags"}) %></li>    
+    <li><%= link_to "Help", wiki_pages_path(:search => {:title_equals => "help:tags"}) %></li>
+    <% if @tag %>
+      <li>|</li>
+      <li><%= link_to "Edit", edit_tag_path(@tag) %></li>
+    <% end %>
   </menu>
 <% end %>
diff --git a/app/views/tags/show.html.erb b/app/views/tags/show.html.erb
index f7b323682..bdf86d876 100644
--- a/app/views/tags/show.html.erb
+++ b/app/views/tags/show.html.erb
@@ -1,6 +1,11 @@
 <div id="c-tags">
   <div id="a-show">
     <h1>Tag: <%= @tag.name %></h1>
+    
+    <ul>
+      <li>Count: <%= @tag.post_count %></li>
+      <li>Category: <%= @tag.category_name %></li>
+    </ul>
   </div>
 </div>