diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1cbdc7c39..2bf2bf174 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -41,7 +41,7 @@ class ApplicationController < ActionController::Base
   end
 
   def fb_user_info
-    @access_token = session[:access_token]
+    @access_token = env['warden'].session[:access_token]
     @logged_in = @access_token.present?
   end
 
diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb
index 373eb100e..b39538d96 100644
--- a/app/controllers/services_controller.rb
+++ b/app/controllers/services_controller.rb
@@ -17,15 +17,15 @@ class ServicesController < ApplicationController
 
       # TODO: This is where you'd want to store the token in your database
       # but for now, we'll just keep it in the session so we don't need a database
-      session[:access_token] = @access_token
+      env['warden'].session[:access_token] = @access_token
       flash[:success] = "Authentication successful."
     end
     redirect_to edit_user_url current_user
   end
 
   def destroy
-    session[:access_token] = nil
-		session[:user_id] = nil
+    env['warden'].session[:access_token] = nil
+		env['warden'].session[:user_id] = nil
     redirect_to edit_user_url current_user
   end