diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java
index 0b3fd187..ddac41e8 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java
@@ -2,8 +2,11 @@ package me.StevenLawson.TotalFreedomMod.Commands;
 
 import java.util.ArrayList;
 import java.util.List;
+
+import me.StevenLawson.TotalFreedomMod.TFM_Superadmin;
 import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
+
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
@@ -63,11 +66,16 @@ public class Command_list extends TFM_Command
 
             if (userSuperadmin)
             {
-                if (TFM_SuperadminList.isSeniorAdmin(player))
+                TFM_Superadmin entry = TFM_SuperadminList.getAdminEntry(player.getName());
+                if (!entry.isSeniorAdmin() && entry.isTelnetAdmin())
+                {
+                    prefix = (ChatColor.DARK_GREEN + "[STA]");
+                }
+                else if (TFM_SuperadminList.isSeniorAdmin(player))
                 {
                     prefix = (ChatColor.LIGHT_PURPLE + "[SrA]");
                 }
-                else
+                else if (TFM_SuperadminList.isUserSuperadmin(player))
                 {
                     prefix = (ChatColor.GOLD + "[SA]");
                 }
diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java
index 42095e83..0d352189 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_Util.java
@@ -10,6 +10,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.*;
@@ -415,6 +416,11 @@ public class TFM_Util
                         return ChatColor.translateAlternateColorCodes('&', loginMessage);
                     }
                 }
+                
+                if (!entry.isSeniorAdmin() && entry.isTelnetAdmin())
+                {
+                    return "a " + ChatColor.DARK_GREEN + "Super Telnet Admin" + ChatColor.AQUA + ".";
+                }
 
                 if (entry.isSeniorAdmin())
                 {
@@ -768,7 +774,12 @@ public class TFM_Util
         }
         else
         {
-            if (TFM_SuperadminList.isSeniorAdmin(sender))
+            TFM_Superadmin entry = TFM_SuperadminList.getAdminEntry(sender.getName());
+            if (!entry.isSeniorAdmin() && entry.isTelnetAdmin())
+            {
+                prefix = ChatColor.DARK_GREEN + "(STA)";
+            }
+            else if (TFM_SuperadminList.isSeniorAdmin(sender))
             {
                 prefix = ChatColor.LIGHT_PURPLE + "(SrA)";
             }