diff --git a/r2/Makefile b/r2/Makefile
index 56db4f61c..9166127e9 100644
--- a/r2/Makefile
+++ b/r2/Makefile
@@ -21,7 +21,7 @@
 ################################################################################
 
 # Javascript files to be compressified
-js_sources           = jquery.json.js jquery.reddit.js reddit.js base.js ui.core.js ui.datepicker.js sponsored.js jquery.flot.js jquery.lazyload.js compact.js blogbutton.js
+js_sources           = jquery.json.js jquery.reddit.js reddit.js base.js ui.core.js ui.datepicker.js sponsored.js jquery.flot.js jquery.lazyload.js compact.js blogbutton.js flair.js
 js_targets           = button.js jquery.flot.js sponsored.js
 localized_js_targets = reddit.js mobile.js
 localized_js_outputs = $(localized_js_targets:.js=.*.js)
diff --git a/r2/r2/lib/js.py b/r2/r2/lib/js.py
index 2c01d1341..c277769cb 100755
--- a/r2/r2/lib/js.py
+++ b/r2/r2/lib/js.py
@@ -183,6 +183,7 @@ module["reddit"] = LocalizedModule("reddit.js",
     "jquery.json.js",
     "jquery.reddit.js",
     "base.js",
+    "flair.js",
     "reddit.js",
 )
 
diff --git a/r2/r2/templates/usertableitem.html b/r2/r2/templates/usertableitem.html
index c19f931fc..9831fe05b 100644
--- a/r2/r2/templates/usertableitem.html
+++ b/r2/r2/templates/usertableitem.html
@@ -75,21 +75,5 @@
       <span title="${thing.rel._date.strftime('%Y-%m-%d %H:%M:%S')}">
         ${timesince(thing.rel._date)}
       </span>
-  %elif thing.name == "flair":
-    <form action="/post/flair" id="flair-${thing.rel._fullname}"
-          method="post" class="pretty-form medium-text flair-entry"
-          onsubmit="return post_form(this, 'flair');">
-      <input type="hidden" name="name" value="${thing.user.name}" />
-      <input type="text" maxlength="32" name="text" class="tiny"
-             onfocus="$(this).parent().addClass('edited')"
-             value="${getattr(thing.user, 'flair_text', '')}" />
-      <input type="text" maxlength="32" name="css_class" class="tiny"
-             onfocus="$(this).parent().addClass('edited')"
-             value="${getattr(thing.user, 'flair_css_class', '')}" />
-      <button onclick="$(this).parent().removeClass('edited')" type="submit">
-        submit
-      </button>
-      <span class="status"></span>
-    </form>
   %endif
 </%def>