diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -4,7 +4,7 @@
 
   def login
     # Site administrator login
-    @countries = Country.find(:all, :include => :sites)
+    @countries = Country.includes(:sites).all
     @country_select = @countries.collect { |c| [c.name, c.id] }
     
     @country_select_with_all = [['Any',0]]