diff --git a/app/models/admin_user.rb b/app/models/admin_user.rb
index c2c213226..b53d6531a 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, :trackable, :validatable
+  devise :database_authenticatable, :trackable, :validatable, :timeoutable
 
   def self.min_password_length
     Devise.password_length.min
diff --git a/app/models/api_user.rb b/app/models/api_user.rb
index ce32c4045..378292076 100644
--- a/app/models/api_user.rb
+++ b/app/models/api_user.rb
@@ -2,6 +2,7 @@ require 'open3'
 
 class ApiUser < User
   include EppErrors
+  devise :database_authenticatable, :trackable, :timeoutable
 
   def epp_code_map
     {
diff --git a/app/models/registrant_user.rb b/app/models/registrant_user.rb
index 12cae0d82..1e1eb452f 100644
--- a/app/models/registrant_user.rb
+++ b/app/models/registrant_user.rb
@@ -2,6 +2,8 @@ class RegistrantUser < User
   ACCEPTED_ISSUER = 'AS Sertifitseerimiskeskus'
   attr_accessor :idc_data
 
+  devise :database_authenticatable, :trackable, :timeoutable
+
   def ability
     @ability ||= Ability.new(self)
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index b69e0250c..8968e2736 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,6 +1,5 @@
 class User < ActiveRecord::Base
   include Versions # version/user_version.rb
-  devise :trackable, :timeoutable
 
   attr_accessor :phone