diff --git a/Essentials/src/main/java/com/earth2me/essentials/Settings.java b/Essentials/src/main/java/com/earth2me/essentials/Settings.java
index 07ab7c3b2c4..cb45137e341 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/Settings.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/Settings.java
@@ -593,10 +593,11 @@ public String getChatFormat(final String group) {
             mFormat = mFormat.replace("{TEAMPREFIX}", "{3}");
             mFormat = mFormat.replace("{TEAMSUFFIX}", "{4}");
             mFormat = mFormat.replace("{TEAMNAME}", "{5}");
-            mFormat = mFormat.replace("{PREFIX}", "{6}");
-            mFormat = mFormat.replace("{SUFFIX}", "{7}");
-            mFormat = mFormat.replace("{USERNAME}", "{8}");
-            mFormat = mFormat.replace("{NICKNAME}", "{9}");
+            mFormat = mFormat.replace("{TEAMCOLOR}", "{6}");
+            mFormat = mFormat.replace("{PREFIX}", "{7}");
+            mFormat = mFormat.replace("{SUFFIX}", "{8}");
+            mFormat = mFormat.replace("{USERNAME}", "{9}");
+            mFormat = mFormat.replace("{NICKNAME}", "{10}");
             mFormat = "§r".concat(mFormat);
             chatFormats.put(group, mFormat);
         }
diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AbstractChatHandler.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AbstractChatHandler.java
index 06986d62698..7d0a0c64358 100644
--- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AbstractChatHandler.java
+++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AbstractChatHandler.java
@@ -98,10 +98,11 @@ protected void handleChatFormat(AsyncPlayerChatEvent event) {
         format = format.replace("{3}", team == null ? "" : team.getPrefix());
         format = format.replace("{4}", team == null ? "" : team.getSuffix());
         format = format.replace("{5}", team == null ? "" : team.getDisplayName());
-        format = format.replace("{6}", prefix);
-        format = format.replace("{7}", suffix);
-        format = format.replace("{8}", username);
-        format = format.replace("{9}", nickname == null ? username : nickname);
+        format = format.replace("{6}", team == null ? "" : ("" + ChatColor.COLOR_CHAR + team.getColor().getChar()));
+        format = format.replace("{7}", prefix);
+        format = format.replace("{8}", suffix);
+        format = format.replace("{9}", username);
+        format = format.replace("{10}", nickname == null ? username : nickname);
 
         // Local, shout and question chat types are only enabled when there's a valid radius
         if (chat.getRadius() > 0 && event.getMessage().length() > 0) {