diff --git a/config/application-example.yml b/config/application-example.yml
index 69ade1976..f54557828 100644
--- a/config/application-example.yml
+++ b/config/application-example.yml
@@ -127,3 +127,5 @@ payments_lhv_url: 'https://www.seb.ee/cgi-bin/dv.sh/ipank.r'
 payments_lhv_bank_certificate: 'eyp_pub.pem'
 payments_lhv_seller_private: 'kaupmees_priv.pem'
 payments_lhv_seller_account: 'testvpos'
+
+user_session_timeout: '3600' # 1 hour
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 83a076769..3fe74cba6 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -155,7 +155,7 @@ Devise.setup do |config|
   # ==> Configuration for :timeoutable
   # The time you want to timeout the user session without activity. After this
   # time the user will be asked for credentials again. Default is 30 minutes.
-  config.timeout_in = 8.hours
+  config.timeout_in = ENV['user_session_timeout'].to_i.seconds if ENV['user_session_timeout']
 
   # If true, expires auth token on session timeout.
   # config.expire_auth_token_on_timeout = false
diff --git a/config/initializers/env_required.rb b/config/initializers/figaro.rb
similarity index 80%
rename from config/initializers/env_required.rb
rename to config/initializers/figaro.rb
index 585fd9031..9c2ae3b34 100644
--- a/config/initializers/env_required.rb
+++ b/config/initializers/figaro.rb
@@ -1,4 +1,4 @@
-required = %w(
+Figaro.require_keys(%w[
   app_name
   zonefile_export_dir
   secret_key_base
@@ -11,6 +11,4 @@ required = %w(
   legal_documents_dir
   bank_statement_import_dir
   time_zone
-)
-
-Figaro.require_keys(required)
+])