diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 8f0f95404..8357487a3 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -13,8 +13,9 @@ def current_user
     user_id = session[:user_id]
     if user_id
       begin
-        @user = User.find(user_id)
-        cookies.signed["user_id"] = @current_user.id
+        u = User.find(user_id)
+        cookies.signed["user_id"] = u.id
+        @user = u
       rescue StandardError
         @user = nil
       end