diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 18ffdbc97..798196ca0 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -44,9 +44,9 @@ class CommentsController < ApplicationController
     end
 
     def check_for_special_comments
-      if ["1", true].include?(comment_params[:as_administrator]) && can?(:comment_as_administrator, debate)
+      if administrator_comment?
         @comment.administrator_id = current_user.administrator.id
-      elsif ["1", true].include?(comment_params[:as_moderator]) && can?(:comment_as_moderator, debate)
+      elsif moderator_comment?
         @comment.moderator_id = current_user.moderator.id
       end
     end
@@ -71,4 +71,12 @@ class CommentsController < ApplicationController
       reply? && parent.author.email_on_comment_reply?
     end
 
+    def administrator_comment?
+      ["1", true].include?(comment_params[:as_administrator]) && can?(:comment_as_administrator, Debate)
+    end
+
+    def moderator_comment?
+      ["1", true].include?(comment_params[:as_moderator]) && can?(:comment_as_moderator, Debate)
+    end
+
 end