diff --git a/common/static/common/templates/discussion/thread-response.underscore b/common/static/common/templates/discussion/thread-response.underscore
index fe7ea3ff42..2b80d0cfac 100644
--- a/common/static/common/templates/discussion/thread-response.underscore
+++ b/common/static/common/templates/discussion/thread-response.underscore
@@ -11,8 +11,8 @@
         <% if (create_sub_comment && !readOnly) { %>
             <form class="comment-form" data-id="<%- wmdId %>">
                 <ul class="discussion-errors"></ul>
-                <label class="sr" for="add-new-comment"><%- gettext("Add a comment") %></label>
-                <div class="comment-body" id="add-new-comment" data-id="<%- wmdId %>"
+                <label class="sr" for="add-new-comment-<%- wmdId %>"><%- gettext("Add a comment") %></label>
+                <div class="comment-body" id="add-new-comment-<%- wmdId %>" data-id="<%- wmdId %>"
                 data-placeholder="<%- gettext('Add a comment') %>"></div>
                 <div class="comment-post-control">
                     <button class="btn-brand discussion-submit-comment control-button"><%- gettext("Submit") %></button>
diff --git a/common/test/acceptance/tests/discussion/test_discussion.py b/common/test/acceptance/tests/discussion/test_discussion.py
index 2ae592b90f..cdc6c9cf40 100644
--- a/common/test/acceptance/tests/discussion/test_discussion.py
+++ b/common/test/acceptance/tests/discussion/test_discussion.py
@@ -827,7 +827,6 @@ class DiscussionResponseEditTest(BaseDiscussionTestCase):
                 'section',  # TODO: AC-491
                 'color-contrast',  # TNL-4644
                 'icon-aria-hidden',  # TNL-4645
-                'duplicate-id',  # TNL-4647
             ]
         })
         page.visit()