diff --git a/app/controllers/user_admin_controller.rb b/app/controllers/user_admin_controller.rb
--- a/app/controllers/user_admin_controller.rb
+++ b/app/controllers/user_admin_controller.rb
@@ -56,7 +56,7 @@
     @user.activated = true
     if @user.save
       flash[:notice] = 'User was successfully created.'
-      redirect_to :action => 'list'
+      redirect_to :action => 'index'
     else
       render :action => 'new'
     end    
@@ -66,7 +66,7 @@
     @user = User.find(params[:id])
     @user.last_ip = nil
     @user.save
-    redirect_to action: 'list', page: params[:page]
+    redirect_to action: 'index', page: params[:page]
   end
 
   def create_from_list
@@ -114,7 +114,7 @@
     flash[:notice] = 'User(s) ' + note.join(', ') + 
       ' were successfully created.  ' +
       '( (+) - created with random passwords.)'   
-    redirect_to :action => 'list'
+    redirect_to :action => 'index'
   end
 
   def edit
@@ -133,7 +133,7 @@
 
   def destroy
     User.find(params[:id]).destroy
-    redirect_to :action => 'list'
+    redirect_to :action => 'index'
   end
 
   def user_stat
@@ -142,7 +142,7 @@
     else
       @problems = Problem.find_available_problems
     end
-    @users = User.find(:all, :include => [:contests, :contest_stat])
+    @users = User.includes(:contests, :contest_stat).where(enabled: true) #find(:all, :include => [:contests, :contest_stat]).where(enabled: true)
     @scorearray = Array.new
     @users.each do |u|
       ustat = Array.new
@@ -200,7 +200,7 @@
   def import
     if params[:file]==''
       flash[:notice] = 'Error importing no file'
-      redirect_to :action => 'list' and return
+      redirect_to :action => 'index' and return
     end
     import_from_file(params[:file])
   end
@@ -253,7 +253,7 @@
     if user and contest
       user.contests << contest
     end
-    redirect_to :action => 'list'
+    redirect_to :action => 'index'
   end
 
   def remove_from_contest
@@ -262,7 +262,7 @@
     if user and contest
       user.contests.delete(contest)
     end
-    redirect_to :action => 'list'
+    redirect_to :action => 'index'
   end
 
   def contest_management