diff --git a/app/assets/javascripts/admin/templates/group.hbs b/app/assets/javascripts/admin/templates/group.hbs
index 6dfd5f6a562..3e176f5a922 100644
--- a/app/assets/javascripts/admin/templates/group.hbs
+++ b/app/assets/javascripts/admin/templates/group.hbs
@@ -101,8 +101,8 @@
   {{/unless}}
 
   {{#unless model.automatic}}
-    <div class="flair_inputs">
-      <div class="flair_left">
+    <div class="flair-inputs">
+      <div class="flair-left">
         <div>
           <label for="flair_url">{{i18n 'admin.groups.flair_url'}}</label>
           {{text-field name="flair_url" value=model.flair_url placeholderKey="admin.groups.flair_url_placeholder"}}
@@ -110,13 +110,13 @@
 
         <div>
           <label for="flair_bg_color">{{i18n 'admin.groups.flair_bg_color'}}</label>
-          {{text-field name="flair_bg_color" class="flair_bg_color" value=model.flair_bg_color placeholderKey="admin.groups.flair_bg_color_placeholder"}}
+          {{text-field name="flair_bg_color" class="flair-bg-color" value=model.flair_bg_color placeholderKey="admin.groups.flair_bg_color_placeholder"}}
         </div>
 
         {{#if flairPreviewIcon}}
           <div>
             <label for="flair_color">{{i18n 'admin.groups.flair_color'}}</label>
-            {{text-field name="flair_color" class="flair_color" value=model.flair_color placeholderKey="admin.groups.flair_color_placeholder"}}
+            {{text-field name="flair_color" class="flair-color" value=model.flair_color placeholderKey="admin.groups.flair_color_placeholder"}}
           </div>
         {{/if}}
 
@@ -127,7 +127,7 @@
       </div>
 
       {{#if flairPreviewIcon}}
-        <div class="flair_right">
+        <div class="flair-right">
           <div>
             <label>{{i18n 'admin.groups.flair_preview'}} Icon</label>
             <div class="avatar-flair-preview">
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index cb7bb105ce5..4a93fedb9a7 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -705,11 +705,11 @@ section.details {
     }
   }
   .form-horizontal {
-    .flair_inputs {
+    .flair-inputs {
       margin-top: 30px;
       margin-bottom: 30px;
 
-      .flair_left {
+      .flair-left {
         float: left;
         width: 60%;
         input[name=flair_url] {
@@ -717,7 +717,7 @@ section.details {
         }
       }
 
-      .flair_right {
+      .flair-right {
         float: left;
         margin-left: 30px;
       }
@@ -725,7 +725,7 @@ section.details {
   }
 }
 .row.groups {
-  input[type='text'].flair_bg_color, input[type='text'].flair_color {
+  input[type='text'].flair-bg-color, input[type='text'].flair-color {
     width: 200px;
   }
 }