diff --git a/src/com/onarandombox/MultiverseCore/MVWorld.java b/src/com/onarandombox/MultiverseCore/MVWorld.java
index 78893302..cdba00a6 100644
--- a/src/com/onarandombox/MultiverseCore/MVWorld.java
+++ b/src/com/onarandombox/MultiverseCore/MVWorld.java
@@ -441,7 +441,7 @@ public class MVWorld {
     private ChatColor translateStringToChatColor(String color) {
         if (color.equalsIgnoreCase("aqua"))
             return ChatColor.AQUA;
-        if (color.equalsIgnoreCase("aqua"))
+        if (color.equalsIgnoreCase("black"))
             return ChatColor.BLACK;
         if (color.equalsIgnoreCase("blue"))
             return ChatColor.BLUE;
diff --git a/src/com/onarandombox/MultiverseCore/command/commands/WhoCommand.java b/src/com/onarandombox/MultiverseCore/command/commands/WhoCommand.java
index 024a1cda..c8ee1238 100644
--- a/src/com/onarandombox/MultiverseCore/command/commands/WhoCommand.java
+++ b/src/com/onarandombox/MultiverseCore/command/commands/WhoCommand.java
@@ -77,7 +77,13 @@ public class WhoCommand extends BaseCommand {
                     result += player.getName() + " ";
                 }
             }
-            sender.sendMessage(color + world.getName() + ChatColor.WHITE + " - " + result);
+            String worldName = world.getName();
+            if(world.getAlias() != null && world.getAlias().length() > 0) {
+                worldName = world.getAlias();
+                color = world.getAliasColor();
+            }
+            
+            sender.sendMessage(color + worldName + ChatColor.WHITE + " - " + result);
         }
         return;
     }