diff --git a/web/app/controllers/vanilla_forums_controller.rb b/web/app/controllers/vanilla_forums_controller.rb
index 34a26dc6f..86ac2bf48 100644
--- a/web/app/controllers/vanilla_forums_controller.rb
+++ b/web/app/controllers/vanilla_forums_controller.rb
@@ -11,7 +11,8 @@ class VanillaForumsController < ApplicationController
 
     user = {name: '', photourl: ''}
     if current_user
-      user = {email: current_user.email, name: current_user.username,
+      name = current_user.admin ? "#{current_user.name} #{Rails.application.config.vanilla_staff_postfix}" : current_user.name
+      user = {email: current_user.email, name: name,
               photourl: current_user.profile_pic,
               uniqueid: current_user.username}
     end
@@ -37,7 +38,8 @@ class VanillaForumsController < ApplicationController
     user = {}
     if current_user
 
-      user = {'email' => current_user.email, 'name' => current_user.name,
+      name = current_user.admin ? "#{current_user.name} #{Rails.application.config.vanilla_staff_postfix}" : current_user.name
+      user = {'email' => current_user.email, 'name' => name,
               'photourl' =>  current_user.resolved_photo_url,
               'uniqueid' =>  current_user.id}
 
diff --git a/web/config/application.rb b/web/config/application.rb
index 2de9677d2..575654d27 100644
--- a/web/config/application.rb
+++ b/web/config/application.rb
@@ -230,6 +230,7 @@ if defined?(Bundler)
     config.vanilla_secret = 'bibbitybobbityslipperyslopes'
     config.vanilla_url = 'http://forums.jamkazam.com'
     config.vanilla_login_url = 'http://forums.jamkazam.com/entry/jsconnect'
+    config.vanilla_staff_postfix = '(JamKazam Staff)'
 
     # we have to do this for a while until all www.jamkazam.com cookies are gone,
     # and only .jamkazam.com cookies are around.. 2016?