diff --git a/project_issue.install b/project_issue.install
index bb9f560..a881bda 100644
--- a/project_issue.install
+++ b/project_issue.install
@@ -1285,3 +1285,20 @@ function project_issue_update_7016() {
   $queue = DrupalQueue::get('project_issue_notifications');
   $queue->createQueue();
 }
+
+/**
+ * Update "Submission guidelines" field instances changing text processing to "Filtered HTML".
+ */
+function project_issue_update_7017() {
+  // Update field instance to our known 'project' node types
+  $bundles = project_project_node_types();
+
+  foreach ($bundles as $bundle) {
+    if ($submission_guidelines_instance = field_read_instance('node', 'field_project_issue_guidelines', $bundle)) {
+      // Set "Filtered HTML" text format to use "Convert line breaks into HTML (i.e. <br> and <p>)" filter
+      $submission_guidelines_instance['widget']['text_processing'] = 1;
+
+      field_update_instance($submission_guidelines_instance);
+    }
+  }
+}
diff --git a/project_issue.module b/project_issue.module
index fc7e91b..3b8c700 100644
--- a/project_issue.module
+++ b/project_issue.module
@@ -400,7 +400,8 @@ function project_issue_form_node_form_alter(&$form, &$form_state, $form_id) {
       if (!empty($project->field_project_issue_guidelines)) {
         $form['project_specific_help_text'] = array(
           '#prefix' => '<div class="messages status project">',
-          '#markup' => filter_xss_admin($project->field_project_issue_guidelines[LANGUAGE_NONE][0]['value']),
+          '#markup' => filter_xss_admin(check_markup($project->field_project_issue_guidelines[LANGUAGE_NONE][0]['value'],
+            $project->field_project_issue_guidelines[LANGUAGE_NONE][0]['format'])),
           '#weight' => -8,
           '#suffix' => '</div>',
         );