diff --git a/app/controllers/public/content_viewer_controller.rb b/app/controllers/public/content_viewer_controller.rb
index 9b0e948..f4cd4f1 100644
--- a/app/controllers/public/content_viewer_controller.rb
+++ b/app/controllers/public/content_viewer_controller.rb
@@ -119,7 +119,7 @@ class ContentViewerController < ApplicationController
   def add_comment
     @comment.author = user if logged_in?
     @comment.article = @page
-    if (logged_in? || verify_recaptcha(:model => @comment, :message => _('Please type the words correctly'))) && @comment.save
+    if (pass_without_comment_captcha? || verify_recaptcha(:model => @comment, :message => _('Please type the words correctly'))) && @comment.save
       @page.touch
       @comment = nil # clear the comment form
       redirect_to :action => 'view_page', :profile => params[:profile], :page => @page.explode_path, :view => params[:view]
@@ -128,6 +128,11 @@ class ContentViewerController < ApplicationController
     end
   end
 
+  def pass_without_comment_captcha?
+    logged_in? && !environment.enabled?('captcha_for_logged_users')
+  end
+  helper_method :pass_without_comment_captcha?
+
   def remove_comment
     @comment = @page.comments.find(params[:remove_comment])
     if (user == @comment.author || user == @page.profile || user.has_permission?(:moderate_comments, @page.profile))
diff --git a/app/models/environment.rb b/app/models/environment.rb
index 0896682..a7a30d0 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -120,7 +120,8 @@ class Environment < ActiveRecord::Base
       'enterprises_are_validated_when_created' => __('Enterprises are validated when created'),
       'show_balloon_with_profile_links_when_clicked' => _('Show a balloon with profile links when a profile image is clicked'),
       'xmpp_chat' => _('XMPP/Jabber based chat'),
-      'show_zoom_button_on_article_images' => _('Show a zoom link on all article images')
+      'show_zoom_button_on_article_images' => _('Show a zoom link on all article images'),
+      'captcha_for_logged_users' => _('Ask captcha to comment for logged users too'),
     }
   end
 
diff --git a/app/views/content_viewer/_comment_form.rhtml b/app/views/content_viewer/_comment_form.rhtml
index e6a842d..8ca838c 100644
--- a/app/views/content_viewer/_comment_form.rhtml
+++ b/app/views/content_viewer/_comment_form.rhtml
@@ -1,6 +1,6 @@
 <script type="text/javascript">
 function submit_comment_form(button) {
-  <% if logged_in? %>
+  <% if pass_without_comment_captcha? %>
   button.form.confirm.value = 'true';
   button.disabled = true;
   button.form.submit();
@@ -42,7 +42,7 @@ function submit_comment_form(button) {
   <%= content_tag('a', '', :name => 'comment_form') + _('Post a comment') %>
 </h4>
 
-<% unless logged_in? %>
+<% unless pass_without_comment_captcha? %>
   <div id="recaptcha-container" style="display: none">
     <h3><%= _('Please type the two words below') %></h3>
     <%= recaptcha_tags(:display => { :theme => 'clean' }, :ajax => true) %>
@@ -72,9 +72,11 @@ function submit_comment_form(button) {
     <%= _('If you are a registered user, you can login and be automatically recognized.') %>
     </p>
 
+  <% end %>
+
+  <% unless pass_without_comment_captcha? %>
     <%= hidden_field_tag(:recaptcha_response_field, nil, :id => nil) %>
     <%= hidden_field_tag(:recaptcha_challenge_field, nil, :id => nil) %>
-
   <% end %>
 
   <%= labelled_form_field(_('Title'), text_field(:comment, :title)) %>
diff --git a/test/functional/content_viewer_controller_test.rb b/test/functional/content_viewer_controller_test.rb
index 543b108..684e35f 100644
--- a/test/functional/content_viewer_controller_test.rb
+++ b/test/functional/content_viewer_controller_test.rb
@@ -1371,4 +1371,32 @@ class ContentViewerControllerTest < Test::Unit::TestCase
     assert_no_tag :tag => 'body', :attributes => { :class => /profile-homepage/ }
   end
 
+  should 'ask for captcha if user not logged' do
+    article = profile.articles.build(:name => 'test')
+    article.save!
+
+    @controller.stubs(:verify_recaptcha).returns(false)
+    post :view_page, :profile => profile.identifier, :page => ['test'], :comment => {:body => "Some comment...", :author => profile}, :confirm => 'true'
+    assert_not_nil assigns(:comment)
+
+    @controller.stubs(:verify_recaptcha).returns(true)
+    post :view_page, :profile => profile.identifier, :page => ['test'], :comment => {:body => "Some comment...", :author => profile}, :confirm => 'true'
+    assert_nil assigns(:comment)
+  end
+
+  should 'ask for captcha if environment defines even with logged user' do
+    article = profile.articles.build(:name => 'test')
+    article.save!
+    login_as('testinguser')
+    @controller.stubs(:verify_recaptcha).returns(false)
+
+    post :view_page, :profile => profile.identifier, :page => ['test'], :comment => {:body => "Some comment...", :author => profile}, :confirm => 'true'
+    assert_nil assigns(:comment)
+
+    environment.enable('captcha_for_logged_users')
+    environment.save!
+
+    post :view_page, :profile => profile.identifier, :page => ['test'], :comment => {:body => "Some comment...", :author => profile}, :confirm => 'true'
+    assert_not_nil assigns(:comment)
+  end
 end
--
libgit2 0.21.2