diff --git a/app/models/spree/user.rb b/app/models/spree/user.rb
index b31099752b..c04ad57268 100644
--- a/app/models/spree/user.rb
+++ b/app/models/spree/user.rb
@@ -8,7 +8,7 @@ module Spree
 
     searchable_attributes :email
 
-    devise :database_authenticatable, :token_authenticatable, :registerable, :recoverable,
+    devise :database_authenticatable, :registerable, :recoverable,
            :rememberable, :trackable, :validatable, :omniauthable,
            :encryptable, :confirmable,
            encryptor: 'authlogic_sha512', reconfirmable: true,
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index d3348dc9a4..332ef1e6e3 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -138,11 +138,6 @@ Devise.setup do |config|
   config.case_insensitive_keys = [:email]
 end
 
-Devise::TokenAuthenticatable.setup do |config|
-  # Defines name of the authentication token params key
-  config.token_authentication_key = :auth_token
-end
-
 if ENV["OPENID_APP_ID"].present? && ENV["OPENID_APP_SECRET"].present?
   Devise.setup do |config|
     site = if Rails.env.development?