diff --git a/app/models/admin_user.rb b/app/models/admin_user.rb
index d76c42dec..c29375d38 100644
--- a/app/models/admin_user.rb
+++ b/app/models/admin_user.rb
@@ -9,7 +9,7 @@ class AdminUser < User
 
   ROLES = %w(user customer_service admin) # should not match to api_users roles
 
-  devise :database_authenticatable, :rememberable, :trackable, :validatable, :lockable
+  devise :rememberable, :validatable, :lockable
 
   def self.min_password_length
     Devise.password_length.min
diff --git a/app/models/user.rb b/app/models/user.rb
index b69e0250c..150311e90 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,6 +1,6 @@
 class User < ActiveRecord::Base
   include Versions # version/user_version.rb
-  devise :trackable, :timeoutable
+  devise :database_authenticatable, :trackable, :timeoutable
 
   attr_accessor :phone