diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6128f6e48ed94d7505b52808f57d8648c270fa4b..9700447f78d01fcc0bb240b68ce25d32e60015d3 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -30,8 +30,13 @@ class ApplicationController < ActionController::Base
   protected
 
   # From https://github.com/plataformatec/devise/wiki/How-To:-Simple-Token-Authentication-Example
+  # https://gist.github.com/josevalim/fb706b1e933ef01e4fb6
   def authenticate_user_from_token!
-    user_token = params[:user_token].presence
+    user_token = if params[:authenticity_token].presence
+                   params[:authenticity_token].presence
+                 elsif params[:private_token].presence
+                   params[:private_token].presence
+                 end
     user = user_token && User.find_by_authentication_token(user_token.to_s)
 
     if user