diff --git a/lms/envs/common.py b/lms/envs/common.py
index 4a3be75764..758844ba5f 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -41,7 +41,7 @@ PERFSTATS = False
 # Features
 MITX_FEATURES = {
     'SAMPLE' : False,
-    'USE_DJANGO_PIPELINE' : False,
+    'USE_DJANGO_PIPELINE' : True,
     'DISPLAY_HISTOGRAMS_TO_STAFF' : True,
     'REROUTE_ACTIVATION_EMAIL' : False,		# nonempty string = address for all activation emails
     'DEBUG_LEVEL' : 0,				# 0 = lowest level, least verbose, 255 = max level, most verbose
diff --git a/lms/static/coffee/src/discussion/discussion.coffee b/lms/static/coffee/src/discussion/discussion.coffee
index b25ab35bf7..e72bfa62fe 100644
--- a/lms/static/coffee/src/discussion/discussion.coffee
+++ b/lms/static/coffee/src/discussion/discussion.coffee
@@ -27,8 +27,8 @@ initializeFollowDiscussion = (discussion) ->
   bindDiscussionEvents: (discussion) ->
 
     $discussion = $(discussion)
-    $discussionNonContent = $discussion.children(".discussion-local")
-    $local = Discussion.generateLocal($discussionNonContent)
+    $discussionNonContent = $discussion.children(".discussion-non-content")
+    $local = Discussion.generateLocal($discussion.children(".discussion-local"))
 
     id = $discussion.attr("_id")
 
@@ -50,7 +50,10 @@ initializeFollowDiscussion = (discussion) ->
         success: (response, textStatus) ->
           $thread = $(response.html)
           $discussion.children(".threads").prepend($thread)
-          $local(".new-post-form").remove()
+          if $discussion.hasClass("inline-discussion")
+            $local(".new-post-form").addClass("collapsed")
+          else if $discussion.hasClass("forum-discussion")
+            $local(".new-post-form").hide()
 
     handleCancelNewPost = (elem) ->
       if $discussion.hasClass("inline-discussion")