diff --git a/config/configuration.yml.example b/config/configuration.yml.example
index 27eb86f68..20f6790d2 100644
--- a/config/configuration.yml.example
+++ b/config/configuration.yml.example
@@ -197,6 +197,11 @@ default:
   # Maximum number of simultaneous AJAX uploads
   #max_concurrent_ajax_uploads: 2
 
+  # Configure OpenIdAuthentication.store
+  #
+  # allowed values: :memory, :file, :memcache
+  openid_authentication_store = :memory
+
 # specific configuration options for production environment
 # that overrides the default ones
 production:
diff --git a/config/initializers/30-redmine.rb b/config/initializers/30-redmine.rb
index 1018ca18c..b0cc1f752 100644
--- a/config/initializers/30-redmine.rb
+++ b/config/initializers/30-redmine.rb
@@ -9,6 +9,13 @@ if secret.present?
   RedmineApp::Application.config.secret_token = secret
 end
 
+if Object.const_defined?(:OpenIdAuthentication)
+  openid_authentication_store = Redmine::Configuration['openid_authentication_store']
+  OpenIdAuthentication.store =
+    openid_authentication_store.present? ?
+      openid_authentication_store : :memory   
+end
+
 Redmine::Plugin.load
 unless Redmine::Configuration['mirror_plugins_assets_on_startup'] == false
   Redmine::Plugin.mirror_assets