diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 6b1e4a62f..4a3f37b8c 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -668,9 +668,12 @@ define([
                             h('h2#cp-app-poll-comments-add-title', Msg.poll_comment_add),
                             h('div#cp-app-poll-comments-add', [
                                 h('input.cp-app-poll-comments-add-name', {
-                                    type: 'text'
+                                    type: 'text',
+                                    placeholder: Msg.anonymous
+                                }),
+                                h('textarea.cp-app-poll-comments-add-msg', {
+                                    placeholder: Msg.poll_comment_placeholder
                                 }),
-                                h('textarea.cp-app-poll-comments-add-msg'),
                                 h('button.cp-app-poll-comments-add-submit.btn.btn-secondary',
                                     Msg.poll_comment_submit),
                                 h('button.cp-app-poll-comments-add-cancel.btn.btn-secondary',
diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 78a1d349c..0dedf52ef 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -268,6 +268,7 @@ define(function () {
     out.poll_comment_add = "Ajouter un commentaire";
     out.poll_comment_submit = "Envoyer";
     out.poll_comment_remove = "Supprimer ce commentaire";
+    out.poll_comment_placeholder = "Votre commentaire";
 
     out.poll_comment_disabled = "Publiez ce sondage en utilisant le bouton ✓ afin d'activer les commentaires.";
 
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 86c21ea6f..a3e254fbe 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -272,6 +272,7 @@ define(function () {
     out.poll_comment_add = "Add a comment";
     out.poll_comment_submit = "Send";
     out.poll_comment_remove = "Delete this comment";
+    out.poll_comment_placeholder = "Your comment";
 
     out.poll_comment_disabled = "Publish this poll using the ✓ button to enable the comments.";
 
diff --git a/www/poll/inner.js b/www/poll/inner.js
index 066e2360d..16a9d2e07 100644
--- a/www/poll/inner.js
+++ b/www/poll/inner.js
@@ -697,6 +697,7 @@ define([
             return comments[a].time > comments[b].time;
         }).forEach(function (k) {
             var c = comments[k];
+            var name = c.name || Messages.anonymous;
             var $c = $('<div>', {
                 'class': 'cp-app-poll-comments-list-el'
             }).prependTo($comments);
@@ -708,7 +709,7 @@ define([
             if (c.avatar && avatars[c.avatar]) {
                 $avatar.append(avatars[c.avatar]);
             } else {
-                common.displayAvatar($avatar, c.avatar, c.name, function ($img) {
+                common.displayAvatar($avatar, c.avatar, name, function ($img) {
                     if (c.avatar && $img.length) { avatars[c.avatar] = $img[0].outerHTML; }
                 });
             }
@@ -717,11 +718,11 @@ define([
                     'href': APP.origin + '/profile/#' + c.profile,
                     'target': '_blank',
                     'class': 'cp-app-poll-comments-list-data-name'
-                }).appendTo($data).text(c.name);
+                }).appendTo($data).text(name);
             } else {
                 $('<span>', {
                     'class': 'cp-app-poll-comments-list-data-name'
-                }).appendTo($data).text(c.name);
+                }).appendTo($data).text(name);
             }
             $('<span>', {
                 'class': 'cp-app-poll-comments-list-data-time'
@@ -759,10 +760,12 @@ define([
     };
     var addComment = function () {
         if (!APP.proxy.comments) { APP.proxy.comments = {}; }
-        var name = APP.$addComment.find('.cp-app-poll-comments-add-name').val();
-        var msg = APP.$addComment.find('.cp-app-poll-comments-add-msg').val();
+        var name = APP.$addComment.find('.cp-app-poll-comments-add-name').val().trim();
+        var msg = APP.$addComment.find('.cp-app-poll-comments-add-msg').val().trim();
         var time = +new Date();
 
+        if (!msg) { return; }
+
         var profile, avatar;
         if (common.isLoggedIn()) {
             profile = metadataMgr.getUserData().profile;