diff --git a/app/controllers/entities_controller.rb b/app/controllers/entities_controller.rb
index 21889cc030..a115591556 100755
--- a/app/controllers/entities_controller.rb
+++ b/app/controllers/entities_controller.rb
@@ -81,7 +81,7 @@ def versions
 
   #----------------------------------------------------------------------------
   def field_group
-    if @tag = Tag.find_or_create_by_name(params[:tag].strip)
+    if @tag = Tag.find_by_name(params[:tag].strip)
       if @field_group = FieldGroup.find_by_tag_id_and_klass_name(@tag.id, klass.to_s)
         @asset = klass.find_by_id(params[:asset_id]) || klass.new
         render 'fields/group' and return
diff --git a/app/models/users/ability.rb b/app/models/users/ability.rb
index a26eadc5ee..017034c658 100644
--- a/app/models/users/ability.rb
+++ b/app/models/users/ability.rb
@@ -23,6 +23,7 @@ def initialize(user)
       can :create, Task
       can :manage, Task, user: user.id
       can :manage, Task, assigned_to: user.id
+      can :manage, Task, completed_by: user.id
 
       # Entities
       can :manage, entities, :access => 'Public'
diff --git a/app/views/tasks/_completed.html.haml b/app/views/tasks/_completed.html.haml
index ef586da059..d535bf677e 100644
--- a/app/views/tasks/_completed.html.haml
+++ b/app/views/tasks/_completed.html.haml
@@ -7,7 +7,7 @@
   .tools
     - if shown_on_landing_page?
       = link_to_discard(completed) + (current_user == completed.user ? ' | ' : '')
-    - if current_user == completed.user
+    - if can?(:manage, completed)
       = link_to_task_uncomplete(completed, bucket)  + ' | '
       = link_to_task_delete(completed, bucket)