diff --git a/app/controllers/auto_completes_controller.rb b/app/controllers/auto_completes_controller.rb
index becc957d..9ab983c4 100644
--- a/app/controllers/auto_completes_controller.rb
+++ b/app/controllers/auto_completes_controller.rb
@@ -13,7 +13,7 @@
 #++
 
 class AutoCompletesController < ApplicationController
-  before_filter :find_project
+  before_filter :find_project, :only => :issues
 
   def issues
     @issues = []
@@ -33,6 +33,13 @@ class AutoCompletesController < ApplicationController
     render :layout => false
   end
 
+  def users
+    @group = Group.find(params[:id])
+    @users = User.active.like(params[:q]).find(:all, :limit => 100) - @group.users
+    render :layout => false
+
+  end
+  
   private
 
   def find_project
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 29b642d2..987f9838 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -126,12 +126,6 @@ class GroupsController < ApplicationController
     end
   end
 
-  def autocomplete_for_user
-    @group = Group.find(params[:id])
-    @users = User.active.not_in_group(@group).like(params[:q]).all(:limit => 100)
-    render :layout => false
-  end
-
   def edit_membership
     @group = Group.find(params[:id])
     @membership = Member.edit_membership(params[:membership_id], params[:membership], @group)
diff --git a/app/views/groups/autocomplete_for_user.html.erb b/app/views/auto_completes/users.html.erb
similarity index 100%
rename from app/views/groups/autocomplete_for_user.html.erb
rename to app/views/auto_completes/users.html.erb
diff --git a/app/views/groups/_users.html.erb b/app/views/groups/_users.html.erb
index 33091ea3..5e9ed0c3 100644
--- a/app/views/groups/_users.html.erb
+++ b/app/views/groups/_users.html.erb
@@ -33,7 +33,7 @@
 		<%= observe_field(:user_search,
                  :frequency => 0.5,
                  :update => :users,
-                 :url => { :controller => 'groups', :action => 'autocomplete_for_user', :id => @group },
+                 :url => auto_complete_users_path(:id => @group),
                  :with => 'q')
                   %>
 
diff --git a/config/routes.rb b/config/routes.rb
index 89fb761c..f012ce2a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -87,6 +87,7 @@ ActionController::Routing::Routes.draw do |map|
 
   # Misc issue routes. TODO: move into resources
   map.auto_complete_issues '/issues/auto_complete', :controller => 'auto_completes', :action => 'issues'
+  map.auto_complete_users '/users/auto_complete', :controller => 'auto_completes', :action => 'users'
   map.preview_issue '/issues/preview/:id', :controller => 'previews', :action => 'issue' # TODO: would look nicer as /issues/:id/preview
   map.issues_context_menu '/issues/context_menu', :controller => 'context_menus', :action => 'issues'
   map.issue_changes '/issues/changes', :controller => 'journals', :action => 'index'
diff --git a/test/functional/auto_completes_controller_test.rb b/test/functional/auto_completes_controller_test.rb
index 88ed0f1e..c561f70c 100644
--- a/test/functional/auto_completes_controller_test.rb
+++ b/test/functional/auto_completes_controller_test.rb
@@ -63,4 +63,30 @@ class AutoCompletesControllerTest < ActionController::TestCase
     assert_response :success
     assert_equal [], assigns(:issues)
   end
+
+  context "GET :users" do
+    setup do
+      @login = User.generate!(:login => 'Acomplete')
+      @firstname = User.generate!(:firstname => 'Complete')
+      @lastname = User.generate!(:lastname => 'Complete')
+      @none = User.generate!(:login => 'hello', :firstname => 'ABC', :lastname => 'DEF')
+      @inactive = User.generate!(:firstname => 'Complete', :status => User::STATUS_LOCKED)
+      
+      get :users, :q => 'complete', :id => Group.first.id
+    end
+    
+    should_respond_with :success
+    
+    should "render a list of matching users in checkboxes" do
+      assert_select "input[type=checkbox][value=?]", @login.id
+      assert_select "input[type=checkbox][value=?]", @firstname.id
+      assert_select "input[type=checkbox][value=?]", @lastname.id
+      assert_select "input[type=checkbox][value=?]", @none.id, :count => 0
+    end
+    
+    should "only show active users" do
+      assert_select "input[type=checkbox][value=?]", @inactive.id, :count => 0
+    end
+  end
+  
 end
diff --git a/test/functional/groups_controller_test.rb b/test/functional/groups_controller_test.rb
index da656e06..c123c48b 100644
--- a/test/functional/groups_controller_test.rb
+++ b/test/functional/groups_controller_test.rb
@@ -100,13 +100,4 @@ class GroupsControllerTest < ActionController::TestCase
       post :destroy_membership, :id => 10, :membership_id => 6
     end
   end
-
-  def test_autocomplete_for_user
-    get :autocomplete_for_user, :id => 10, :q => 'mis'
-    assert_response :success
-    users = assigns(:users)
-    assert_not_nil users
-    assert users.any?
-    assert !users.include?(Group.find(10).users.first)
-  end
 end
diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index 6ae25c47..dc9f0532 100644
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -346,4 +346,9 @@ class RoutingTest < ActionController::IntegrationTest
   context "administration panel" do
     should_route :get, "/admin/projects", :controller => 'admin', :action => 'projects'
   end
+
+  context "auto_completes" do
+    should_route :get, "/users/auto_complete", :controller => 'auto_completes', :action => 'users'
+  end
+  
 end