diff --git a/src/com/massivecraft/massivecore/command/type/TypeAbstract.java b/src/com/massivecraft/massivecore/command/type/TypeAbstract.java
index d20314d1..4615e60e 100644
--- a/src/com/massivecraft/massivecore/command/type/TypeAbstract.java
+++ b/src/com/massivecraft/massivecore/command/type/TypeAbstract.java
@@ -38,6 +38,8 @@ public abstract class TypeAbstract<T> implements Type<T>
 	public static final ChatColor COLOR_DEFAULT = ChatColor.YELLOW;
 	public static final ChatColor COLOR_NUMBER = ChatColor.LIGHT_PURPLE;
 	
+	public static final int TAB_LIST_UUID_THRESHOLD = 5;
+	
 	// -------------------------------------------- //
 	// META
 	// -------------------------------------------- //
diff --git a/src/com/massivecraft/massivecore/command/type/sender/TypeSenderIdAbstract.java b/src/com/massivecraft/massivecore/command/type/sender/TypeSenderIdAbstract.java
index 0a05bd6c..d812cc24 100644
--- a/src/com/massivecraft/massivecore/command/type/sender/TypeSenderIdAbstract.java
+++ b/src/com/massivecraft/massivecore/command/type/sender/TypeSenderIdAbstract.java
@@ -155,10 +155,14 @@ public abstract class TypeSenderIdAbstract<T> extends TypeAbstract<T>
 		Set<String> ids = IdUtil.getIds(presence, type);
 		
 		// Step 4: Create Ret with visible names
-		Set<String> ret = new MassiveSet<String>(ids.size());
+		boolean addIds = (arg.length() >= TAB_LIST_UUID_THRESHOLD);
+		int size = ids.size();
+		if (addIds) size *= 2;
+		Set<String> ret = new MassiveSet<String>(size);
 		for (String id : ids)
 		{
 			if ( ! Mixin.isVisible(id, sender)) continue;
+			if (addIds) ret.add(id);
 			String name = IdUtil.getName(id);
 			if (name == null) continue;
 			ret.add(name);