diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index fcd8e8e..14013a0 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -9,7 +9,7 @@ class ApplicationController < ActionController::Base
   private
 
   def current_user
-    @current_user ||= User.find(session[:user_id]) if session[:user_id]
+    @current_user ||= User.first(:id => session[:user_id]) if session[:user_id]
   end
 
   def current_user=(user)