diff --git a/app/assets/javascripts/admin/templates/user_index.js.handlebars b/app/assets/javascripts/admin/templates/user_index.js.handlebars
index b7f7cd69d71..dddcee6038d 100644
--- a/app/assets/javascripts/admin/templates/user_index.js.handlebars
+++ b/app/assets/javascripts/admin/templates/user_index.js.handlebars
@@ -101,7 +101,7 @@
         {{i18n badges.badge_count count=badge_count}}
       </div>
       <div class='controls'>
-        {{#link-to 'adminUser.badges' this class="btn"}}{{i18n admin.badges.edit_badges}}{{/link-to}}
+        {{#link-to 'adminUser.badges' this class="btn"}}<i class="fa fa-certificate"></i>{{i18n admin.badges.edit_badges}}{{/link-to}}
       </div>
     </div>
   {{/if}}
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index a33f9b5a4e5..7befceae7c1 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1067,7 +1067,7 @@ en:
       This invitation is from a trusted user, so you can reply to the discussion immediately.
 
   invite_forum_mailer:
-    subject_template: "[%{site_name}] %{invitee_name} invited you to join"
+    subject_template: "%{invitee_name} invited you to join %{site_name}"
     text_body_template: |
       %{invitee_name} invited you to join