diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py
index b0c52104c..5fdbd4ddc 100644
--- a/r2/r2/controllers/api.py
+++ b/r2/r2/controllers/api.py
@@ -2349,12 +2349,17 @@ class ApiController(RedditController):
 
         # Push changes back to client.
         if new:
-            jquery('#empty-flair-template').before(
+            empty_ids = {
+                USER_FLAIR: '#empty-user-flair-template',
+                LINK_FLAIR: '#empty-link-flair-template',
+            }
+            empty_id = empty_ids[flair_type]
+            jquery(empty_id).before(
                 FlairTemplateEditor(flair_template, flair_type)
                 .render(style='html'))
             empty_template = FlairTemplate()
             empty_template._committed = True  # to disable unnecessary warning
-            jquery('#empty-flair-template').html(
+            jquery(empty_id).html(
                 FlairTemplateEditor(empty_template, flair_type)
                 .render(style='html'))
             form.set_html('.status', _('saved'))
diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py
index fa4629993..3ef239c42 100644
--- a/r2/r2/lib/pages/pages.py
+++ b/r2/r2/lib/pages/pages.py
@@ -2626,7 +2626,7 @@ class FlairTemplateEditor(Templated):
 class FlairTemplateSample(Templated):
     """Like a read-only version of FlairTemplateEditor."""
     def __init__(self, flair_template, flair_type):
-        if flair_type is USER_FLAIR:
+        if flair_type == USER_FLAIR:
             wrapped_user = WrappedUser(c.user, subreddit=c.site,
                                        force_show_flair=True,
                                        flair_template=flair_template)
diff --git a/r2/r2/templates/flairtemplatelist.html b/r2/r2/templates/flairtemplatelist.html
index 38fd7acea..6a798b315 100644
--- a/r2/r2/templates/flairtemplatelist.html
+++ b/r2/r2/templates/flairtemplatelist.html
@@ -21,7 +21,7 @@
 ################################################################################
 
 <%!
-    from r2.models import FlairTemplate
+    from r2.models import FlairTemplate, USER_FLAIR, LINK_FLAIR
     from r2.lib.pages.pages import FlairTemplateEditor
 
     empty_template = FlairTemplate()
@@ -39,7 +39,14 @@
     %for flair_template in thing.templates:
       ${flair_template}
     %endfor
-    <div id="empty-flair-template">
+
+    <%
+    if thing.flair_type == USER_FLAIR:
+        empty_id = 'empty-user-flair-template'
+    elif thing.flair_type == LINK_FLAIR:
+        empty_id = 'empty-link-flair-template'
+    %>
+    <div id="${empty_id}">
       ${FlairTemplateEditor(empty_template, thing.flair_type)}
     </div>
   </div>
diff --git a/r2/r2/templates/flairtemplatesample.html b/r2/r2/templates/flairtemplatesample.html
index 9722a2cf6..aaaba08c7 100644
--- a/r2/r2/templates/flairtemplatesample.html
+++ b/r2/r2/templates/flairtemplatesample.html
@@ -37,9 +37,9 @@ from r2.models import USER_FLAIR, LINK_FLAIR
 </%def>
 
 
-%if thing.flair_type is USER_FLAIR:
+%if thing.flair_type == USER_FLAIR:
   ${thing.wrapped_user}
-%elif thing.flair_type is LINK_FLAIR:
+%elif thing.flair_type == LINK_FLAIR:
   <div class="thing">
     <p class="title">
       %if c.site.link_flair_position == 'left':