diff --git a/AUTHORS b/AUTHORS
index 0f27817b18..45b0c48603 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -194,3 +194,4 @@ Mark Sadecki <msadecki@edx.org>
 Dino Cikatić <dcikatic@edx.org>
 Davorin Šego <dsego@edx.org>
 Marko Jevtić <mjevtic@edx.org>
+Ahsan Ulhaq <ahsan@edx.org>
diff --git a/common/lib/xmodule/xmodule/templates/problem/problem_with_hint.yaml b/common/lib/xmodule/xmodule/templates/problem/problem_with_hint.yaml
index 8c6e4d3a83..e8981840b9 100644
--- a/common/lib/xmodule/xmodule/templates/problem/problem_with_hint.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/problem_with_hint.yaml
@@ -36,13 +36,12 @@ data: |
         hint = "&lt;font color='blue'&gt;Hint: {0}&lt;/font&gt;".format(hint)
         new_cmap.set_hint_and_mode(aid,hint,'always')
     </script>
-        <p>
-    What is the best programming language that exists today? You may enter your answer in upper or lower case, with or without quotes. </p>
-        <p>
+        <label>
+    What is the best programming language that exists today? You may enter your answer in upper or lower case, with or without quotes.
           <customresponse cfn="test_str" expect="python">
-            <textline correct_answer="python" label="What is the best programming language that exists today?"/>
+            <textline correct_answer="python"/>
             <hintgroup hintfn="hint_fn"/>
           </customresponse>
-        </p>
+        </label>
       </text>
     </problem>
diff --git a/common/lib/xmodule/xmodule/templates/problem/problem_with_hint_in_latex.yaml b/common/lib/xmodule/xmodule/templates/problem/problem_with_hint_in_latex.yaml
index 9cdcb5d7af..b4f5bda678 100644
--- a/common/lib/xmodule/xmodule/templates/problem/problem_with_hint_in_latex.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/problem_with_hint_in_latex.yaml
@@ -81,13 +81,12 @@ data: |
         hint = "&lt;font color='blue'&gt;Hint: {0}&lt;/font&gt;".format(hint)
         new_cmap.set_hint_and_mode(aid,hint,'always')
     </script>
-        <p>
-    What is the best programming language that exists today? You may enter your answer in upper or lower case, with or without quotes. </p>
-        <p>
+        <label>
+    What is the best programming language that exists today? You may enter your answer in upper or lower case, with or without quotes.
           <customresponse cfn="test_str" expect="python">
-            <textline correct_answer="python" label="What is the best programming language that exists today?"/>
+            <textline correct_answer="python"/>
             <hintgroup hintfn="hint_fn"/>
           </customresponse>
-        </p>
+        </label>
       </text>
     </problem>