diff --git a/app/controllers/public/account_controller.rb b/app/controllers/public/account_controller.rb
index 0e5457b..be6640d 100644
--- a/app/controllers/public/account_controller.rb
+++ b/app/controllers/public/account_controller.rb
@@ -6,6 +6,8 @@ class AccountController < ApplicationController
   before_filter :redirect_if_logged_in, :only => [:login, :signup]
   before_filter :protect_from_bots, :only => :signup
 
+  protect_from_forgery except: [:login]
+
   helper CustomFieldsHelper
   # say something nice, you goof!  something sweet.
   def index
diff --git a/vendor/plugins/noosfero_caching/init.rb b/vendor/plugins/noosfero_caching/init.rb
index 0521439..bd3e6c9 100644
--- a/vendor/plugins/noosfero_caching/init.rb
+++ b/vendor/plugins/noosfero_caching/init.rb
@@ -27,7 +27,6 @@ module NoosferoHttpCaching
   end
 
   def noosfero_session_check
-    return unless params[:controller] == 'account'
     headers["X-Noosfero-Auth"] = (session[:user] != nil).to_s
   end
 
--
libgit2 0.21.2