diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 72f1482708..0619486e6a 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -52,7 +52,7 @@ def http_auth_body
 
   # Account lockout
   config.lock_strategy = :failed_attempts
-  config.unlock_strategy = :both
+  config.unlock_strategy = :time
   config.unlock_keys = [ :time ]
   config.maximum_attempts = CheckConfig.get('devise_maximum_attempts', 5)
   config.unlock_in = CheckConfig.get('devise_unlock_accounts_after', 1).hour