diff --git a/Towny/src/main/java/com/palmergames/bukkit/towny/command/TownCommand.java b/Towny/src/main/java/com/palmergames/bukkit/towny/command/TownCommand.java
index 7e6934c691..e811f7588b 100644
--- a/Towny/src/main/java/com/palmergames/bukkit/towny/command/TownCommand.java
+++ b/Towny/src/main/java/com/palmergames/bukkit/towny/command/TownCommand.java
@@ -319,7 +319,6 @@ public List<String> onTabComplete(CommandSender sender, Command command, String
 		case "outlawlist":
 		case "plots":
 		case "delete":
-		case "join":
 		case "merge":
 		case "plotgrouplist":
 		case "allylist":
@@ -329,6 +328,12 @@ public List<String> onTabComplete(CommandSender sender, Command command, String
 			if (args.length == 2)
 				return getTownyStartingWith(args[1], "t");
 			break;
+		case "join":
+			if (args.length == 2) {
+				List<String> randTowns = getTownyStartingWith(args[1], "t");
+				Collections.shuffle(randTowns);
+				return randTowns;}
+			break;
 		case "deposit":
 			if (args.length == 3)
 				return getTownyStartingWith(args[2], "t");