diff --git a/forum/templates/forum.html b/forum/templates/forum.html
index b7673481e..b30644bb9 100644
--- a/forum/templates/forum.html
+++ b/forum/templates/forum.html
@@ -61,8 +61,8 @@ <h1 class="top"><i class="icon-double-angle-right"></i>{{ course.name }}</h1>
                         <article class="question">
                             <div class="stats">
                                 <div class="arrow-right"></div>
-                                <p><span class="numbers-votes">{{ question.votes.count }}</span>votos</p>
-                                <p><span class="numbers-answers">{{ question.answers.count }}</span>respostas</p>
+                                <p><span class="numbers-votes">{{ question.count_votes }}</span>voto{% if question.count_votes > 1 %}s{% endif %}</p>
+                                <p><span class="numbers-answers">{{ question.answers.count }}</span>resposta{% if question.answers.count > 1 %}s{% endif %}</p>
                             </div>
                             <div class="question">
                                 <p><a href="{% url 'forum_question' question.slug %}">{{ question.title }}</a></p>
diff --git a/forum/templates/question.html b/forum/templates/question.html
index b5a5f1488..daa3ce7c5 100644
--- a/forum/templates/question.html
+++ b/forum/templates/question.html
@@ -11,6 +11,7 @@
 {% block content %}
 <script>
  window.question_id = {{ question.pk }};
+ window.user_id = {{ user.pk }};
 </script>
 
 <!-- CONTAINER -->
@@ -82,7 +83,7 @@ <h1>{{ question.title }}</h1>
                     <header>
                         <div class="row">
                             <div class="col-sm-6 col-lg-6">
-                                <h1>{{ question.answers.count }} Respostas:</h1>
+                                <h1><span ng-init="num_answers={{ question.answers.count }}">{% verbatim angularjs %} {{ num_answers }} {% endverbatim angularjs %}</span> Resposta<span ng-if="num_answers>1">s</span></h1>
                             </div>
                         </div>
                     </header>
diff --git a/forum/views.py b/forum/views.py
index 2782dd863..34f899088 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -74,7 +74,7 @@ def pre_save(self, obj):
 class AnswerViewSet(viewsets.ModelViewSet):
     model = Answer
     serializer_class = AnswerSerializer
-    filter_fields = ('question',)
+    filter_fields = ('question', 'user')
 
     def pre_save(self, obj):
         obj.user = self.request.user