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
@@ -2,8 +2,6 @@
 
   before_filter :authenticate, :except => [:index, :login]
 
-  layout 'application'
-
   verify :method => :post, :only => [:submit],
          :redirect_to => { :action => :index }
 
@@ -13,8 +11,8 @@
   end
 
   def login
-    MainController.layout 'empty'
     reset_session
+    render :action => 'login', :layout => 'empty'
   end
 
   def list