diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee
index 1b7f9bb4fb..2f58e86cb2 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/edit.coffee
@@ -50,6 +50,10 @@ Write a persuasive essay to a newspaper reflecting your vies on censorship in li
       mode: null
       })
       @setCurrentEditor(@markdown_editor)
+      selection = @markdown_editor.getSelection()
+      #Auto-add in the needed template if it isn't already in there.
+      if(@markdown_editor.getValue() == "")
+        @markdown_editor.setValue(OpenEndedMarkdownEditingDescriptor.promptTemplate + "\n" + OpenEndedMarkdownEditingDescriptor.rubricTemplate + "\n" + OpenEndedMarkdownEditingDescriptor.tasksTemplate)
       # Add listeners for toolbar buttons (only present for markdown editor)
       @element.on('click', '.xml-tab', @onShowXMLButton)
       @element.on('click', '.format-buttons a', @onToolbarButton)
diff --git a/lms/templates/combinedopenended/openended/open_ended.html b/lms/templates/combinedopenended/openended/open_ended.html
index 9fb136cee6..909ef15838 100644
--- a/lms/templates/combinedopenended/openended/open_ended.html
+++ b/lms/templates/combinedopenended/openended/open_ended.html
@@ -10,10 +10,6 @@
   <div class="grader-status">
     % if state == 'initial':
       <span class="unanswered" style="display:inline-block;" id="status_${id}">Unanswered</span>
-    % elif state in ['done', 'post_assessment'] and correct == 'correct':
-    <span class="correct" id="status_${id}"></span> <p>Correct</p>
-    % elif state in ['done', 'post_assessment'] and correct == 'incorrect':
-    <span class="incorrect" id="status_${id}"></span> <p>Incorrect. </p>
     % elif state == 'assessing':
       <span class="grading" id="status_${id}">Submitted for grading.
       % if eta_message is not None: