diff --git a/app/controllers/report_controller.rb b/app/controllers/report_controller.rb
--- a/app/controllers/report_controller.rb
+++ b/app/controllers/report_controller.rb
@@ -19,7 +19,7 @@
 
   def current_score
     @problems = Problem.available_problems
-    if params[:group_id]
+    if params[:group_id] && params[:users] == 'group'
       @group = Group.find(params[:group_id])
       @users = @group.users.where(enabled: true)
     else
@@ -50,10 +50,12 @@
     end
 
     #users
-    @users = if params[:users] == "all" then 
+    @users = if params[:users] == "group" then 
+               Group.find(params[:group_id]).users.all
+             elsif params[:users] == 'enabled'
+               User.includes(:contests).includes(:contest_stat).where(enabled: true)
+             else
                User.includes(:contests).includes(:contest_stat)
-             else 
-               User.includes(:contests).includes(:contest_stat).where(enabled: true)
              end
 
     #set up range from param