diff --git a/r2/r2/public/static/css/reddit.css b/r2/r2/public/static/css/reddit.css
index 85eec8e4d..380f96c83 100644
--- a/r2/r2/public/static/css/reddit.css
+++ b/r2/r2/public/static/css/reddit.css
@@ -700,6 +700,8 @@ ul.flat-vert {text-align: left;}
     display: block;
 }
 
+.flairselector .error { text-align: center; }
+
 .flairselector ul { float: left; width: 200px; }
 
 .flairselector .selected, .flairselector.active li {
diff --git a/r2/r2/templates/flairselector.html b/r2/r2/templates/flairselector.html
index d635ecb47..4fa34db06 100644
--- a/r2/r2/templates/flairselector.html
+++ b/r2/r2/templates/flairselector.html
@@ -21,8 +21,8 @@
 ################################################################################
 
 <h2>${_("select flair")}</h2>
-<ul>
-  %if thing.choices and c.site.flair_self_assign_enabled:
+%if thing.choices and c.site.flair_self_assign_enabled:
+  <ul>
     %for choice in thing.choices:
       <%
         li_class = 'flairsample-%s' % thing.position
@@ -35,16 +35,17 @@
         ${choice}
       </li>
     %endfor
-  %else:
-    <li class="error">${_("flair selection unavailable")}</li>
-  %endif
-</ul>
-<form action="/post/selectflair" method="post">
-  <div class="flairselection"></div>
-  <input type="hidden" name="flair_template_id">
-  <div class="customizer">
-    ${_("customize text")}
-    <input type="text" size="16" maxlength="64" name="text">
-  </div>
-  <button type="submit">${_('save')}</button>
-</form>
+  </ul>
+  <form action="/post/selectflair" method="post">
+    <div class="flairselection"></div>
+    <input type="hidden" name="flair_template_id">
+    <div class="customizer">
+      ${_("customize text")}
+      <input type="text" size="16" maxlength="64" name="text">
+    </div>
+    <button type="submit">${_('save')}</button>
+    <span class="status"></span>
+  </form>
+%else:
+  <div class="error">${_("flair selection unavailable")}</div>
+%endif
diff --git a/r2/r2/templates/flairtemplatelist.html b/r2/r2/templates/flairtemplatelist.html
index 67d45ef32..468db1e79 100644
--- a/r2/r2/templates/flairtemplatelist.html
+++ b/r2/r2/templates/flairtemplatelist.html
@@ -46,5 +46,6 @@
     <button class="flairtemplateclear">
       ${_("clear all flair templates")}
     </button>
+    <span class="status"></span>
   </form>
 </div>