diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index de80ef5..8aad073 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -7,7 +7,7 @@ class UsersController < AdminController
   include UsersHelper
 
   def index
-    @filter = params[:filter]
+    @filter = params[:filter] || 'all_users'
     scope = environment.people.no_templates
     if @filter == 'admin_users'
       scope = scope.admins
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index 0871d52..af89c6b 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -117,6 +117,11 @@ class UsersControllerTest < ActionController::TestCase
     assert_order ['ana', 'bill', 'creed', 'jeremy'], assigns(:collection).map(&:name)
   end
 
+  should 'set filter to all_users by default' do
+    get :index
+    assert_equal 'all_users', assigns(:filter)
+  end
+
   should 'response as XML to export users' do
     get :download, :format => 'xml'
     assert_equal 'text/xml', @response.content_type
--
libgit2 0.21.2