diff --git a/js/app/studs.js b/js/app/studs.js
index 2fbe19cc5a93d3e1fe06f721e5f3e0945a153950..816f81410c07c738ae93cec8bd7a762f8e0da402 100644
--- a/js/app/studs.js
+++ b/js/app/studs.js
@@ -199,15 +199,14 @@ function checkCommentSending() {
 
     // on page load, "textSend" is not set
     if ("undefined" === typeof button.data("textSend")) {
-        button.data("textSend", button.val());
+        button.data("textSend", button.text());
     }
 
-
 	if (!form.get(0).checkValidity()) {
 		button.prop("disabled", true);
-		button.val(button.data("textWait"));
+		button.text(button.data("textWait"));
 	} else {
 		button.prop("disabled", false);
-		button.val(button.data("textSend"));
+		button.text(button.data("textSend"));
 	}
 }
diff --git a/tpl/part/comments.tpl b/tpl/part/comments.tpl
index bf75a098a62b002e1a827aad446a54b9ecc3e515..387a52932b2bea47b249d3ac5f67a33f928a1b0c 100644
--- a/tpl/part/comments.tpl
+++ b/tpl/part/comments.tpl
@@ -26,10 +26,11 @@
                         <button
 	                        type="submit"
 	                        id="add_comment"
-	                        value="{__('Comments', 'Send the comment')|html}"
 	                        class="btn btn-success"
 	                        data-text-wait="{__('Comments', 'Type your name and a comment to send it')|html}"
                         >
+                        	{__('Comments', 'Send the comment')|html}
+                        </button>
                     </div>
                 </fieldset>
             </div>