diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb
--- a/app/controllers/main_controller.rb
+++ b/app/controllers/main_controller.rb
@@ -45,7 +45,7 @@
     #   @hidelogin = true
     # end
 
-    @announcements = Announcement.find_for_frontpage
+    @announcements = Announcement.frontpage
     render :action => 'login', :layout => 'empty'
   end
 
@@ -217,9 +217,9 @@
 
   def prepare_announcements(recent=nil)
     if GraderConfiguration.show_tasks_to?(@user)
-      @announcements = Announcement.find_published(true)
+      @announcements = Announcement.published(true)
     else
-      @announcements = Announcement.find_published
+      @announcements = Announcement.published
     end
     if recent!=nil
       recent_id = recent.to_i