diff --git a/app/controllers/context_menus_controller.rb b/app/controllers/context_menus_controller.rb
index dd93724..1e17039 100644
--- a/app/controllers/context_menus_controller.rb
+++ b/app/controllers/context_menus_controller.rb
@@ -26,8 +26,11 @@ class ContextMenusController < ApplicationController
             :delete => User.current.allowed_to?(:delete_issues, @projects)
             }
     if @project
-      @assignables = @project.assignable_users
-      @assignables << @issue.assigned_to if @issue && @issue.assigned_to && !@assignables.include?(@issue.assigned_to)
+      if @issue
+        @assignables = @issue.assignable_users
+      else
+        @assignables = @project.assignable_users
+      end
       @trackers = @project.trackers
     else
       #when multiple projects, we only keep the intersection of each set