diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 17d1138..bf43e1f 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -153,7 +153,7 @@ class AccountController < ApplicationController
 
   
   def open_id_authenticate(openid_url)
-    authenticate_with_open_id(openid_url, :required => [:nickname, :fullname, :email], :return_to => signin_url) do |result, identity_url, registration|
+    authenticate_with_open_id(openid_url, :required => [:nickname, :fullname, :email], :return_to => signin_url, :policy_url => Setting.openid_policy_url) do |result, identity_url, registration|
       if result.successful?
         user = User.find_or_initialize_by_identity_url(identity_url)
         if user.new_record?
diff --git a/app/views/settings/_authentication.rhtml b/app/views/settings/_authentication.rhtml
index f4b8dbf..a2a694a 100644
--- a/app/views/settings/_authentication.rhtml
+++ b/app/views/settings/_authentication.rhtml
@@ -29,6 +29,10 @@
 <%= hidden_field_tag 'settings[openid]', 0 %>
 <%= check_box_tag 'settings[openid]', 1, Setting.openid?, :disabled => !Object.const_defined?(:OpenID) %>
 </p>
+
+<p><label><%= l(:setting_openid_policy_url) %></label>
+<%= text_field_tag 'settings[openid_policy_url]', Setting.openid_policy_url, :size => 60, :disabled => !Object.const_defined?(:OpenID) %>
+</p>
 </div>
 
 <div style="float:right;">
diff --git a/config/locales/de.yml b/config/locales/de.yml
index dfe22ae..ec03a5b 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -814,6 +814,7 @@ de:
   setting_file_max_size_displayed: Maximale Größe der abgezeigten Textdatei 
   field_watcher: Beobachter
   setting_openid: Erlaube OpenID Anmeldung und Registrierung
+  setting_openid_policy_url: URL zur Datenschutzrichtlinie für OpenID
   field_identity_url: OpenID URL
   label_login_with_open_id_option: oder anmeldung mit OpenID
   field_content: Inhalt
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0000e42..9d46a65 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -310,6 +310,7 @@ en:
   setting_file_max_size_displayed: Max size of text files displayed inline
   setting_repository_log_display_limit: Maximum number of revisions displayed on file log
   setting_openid: Allow OpenID login and registration
+  setting_openid_policy_url: OpenID privacy policy URL
   setting_password_min_length: Minimum password length
   setting_new_project_user_role_id: Role given to a non-admin user who creates a project
   setting_default_projects_modules: Default enabled modules for new projects
diff --git a/config/settings.yml b/config/settings.yml
index f529d02..4f2512c 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -168,3 +168,5 @@ gravatar_enabled:
   default: 0
 openid:
   default: 0
+openid_policy_url:
+  default: 'http://www.bbbonline.org/privacy/sample_privacy.asp'
\ No newline at end of file