diff --git a/app/views/polls/questions/_new_answer.html.erb b/app/views/polls/questions/_new_answer.html.erb
index 2f056bafa..9df88a7e7 100644
--- a/app/views/polls/questions/_new_answer.html.erb
+++ b/app/views/polls/questions/_new_answer.html.erb
@@ -1,5 +1,6 @@
 <%= form_tag(create_answer_question_path(question, token: token), method: :post, remote: true) do %>
-  <label> You can add your own answer</label>
-  <input type="text" class="medium-10" name="answer">
-  <input class="button success" type="submit" value="<%= t("poll_questions.show.add_answer") %>">
+  <% id = "your_answer_#{SecureRandom.hex}" %>
+  <%= label_tag :answer, t("poll_questions.show.your_answer"), for: id %>
+  <%= text_field_tag :answer, nil, class: "medium-10", id: id %>
+  <%= submit_tag t("poll_questions.show.add_answer"), class: "button success" %>
 <% end %>
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml
index 2ea40d22e..1b9adb735 100644
--- a/config/locales/en/general.yml
+++ b/config/locales/en/general.yml
@@ -701,6 +701,7 @@ en:
     show:
       vote_answer: "Vote %{answer}"
       voted: "You have voted %{answer}"
+      your_answer: "You can add your own answer"
       add_answer: "Add answer"
     description:
       multiple: "You can select a maximum of %{maximum} answers."
diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml
index f879e29aa..f55bb69d8 100644
--- a/config/locales/es/general.yml
+++ b/config/locales/es/general.yml
@@ -699,6 +699,7 @@ es:
     show:
       vote_answer: "Votar %{answer}"
       voted: "Has votado %{answer}"
+      your_answer: "Puedes añadir tu propia respuesta"
       add_answer: "Añadir respuesta"
     description:
       multiple: "Puedes seleccionar un máximo de %{maximum} respuestas."