diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 7590751..ce73728 100755
--- 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_by_user_id(session[:user_id].to_s)
+    @current_user ||= User.find_by_auth_token!(cookies[:auth_token].to_s)
   end
 
   def authenticated