diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb
index 531ed6966..5713e9a2e 100644
--- a/app/views/tags/_tag_name.html.erb
+++ b/app/views/tags/_tag_name.html.erb
@@ -72,11 +72,12 @@
<% end %>
<% when '6' %>
- <% if (User.current.logged? &&
+ <%# if (User.current.logged? &&
User.current.admin?
# && (@project && User.current.member_of?(@project))
)
%>
+ <% if obj.author_id == User.current.id || User.current.admin?%>
<%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
:taggable_id => obj.id, :taggable_type => object_flag %>
<% end %>
@@ -94,14 +95,8 @@
:taggable_id => obj.id, :taggable_type => object_flag %>
<% end %>
<% end %>
-
-