diff --git a/src/main/java/com/comandante/creeper/command/DefaultCommandHandler.java b/src/main/java/com/comandante/creeper/command/DefaultCommandHandler.java
index 9569ca1827911dbb1cd46675689c7f92a8231034..62758682877b88008b08ce5a34416fe0059b4612 100644
--- a/src/main/java/com/comandante/creeper/command/DefaultCommandHandler.java
+++ b/src/main/java/com/comandante/creeper/command/DefaultCommandHandler.java
@@ -44,13 +44,13 @@ public class DefaultCommandHandler {
             TellCommand tellCommand = new TellCommand(playerId, gameManager, originalMessage);
             commandService.processCommand(tellCommand);
         }
-        else if (WhoamiCommand.validTriggers.contains(rootCommand)){
-            WhoamiCommand whoamiCommand = new WhoamiCommand(playerId, gameManager, originalMessage);
-            commandService.processCommand(whoamiCommand);
-        }
         else if (WhoCommand.validTriggers.contains(rootCommand)){
             WhoCommand whoCommand = new WhoCommand(playerId, gameManager, originalMessage);
             commandService.processCommand(whoCommand);
+        }
+        else if (WhoamiCommand.validTriggers.contains(rootCommand)){
+            WhoamiCommand whoamiCommand = new WhoamiCommand(playerId, gameManager, originalMessage);
+            commandService.processCommand(whoamiCommand);
         } else {
             UnknownCommand unknownCommand = new UnknownCommand(playerId, gameManager, originalMessage);
             commandService.processCommand(unknownCommand);
diff --git a/src/main/java/com/comandante/creeper/command/commands/WhoCommand.java b/src/main/java/com/comandante/creeper/command/commands/WhoCommand.java
index c8222cafcf0a98512c0d7a803c1c2211e26ec84d..d44a20aa692c3af119d5881fddbd9733f850e86f 100644
--- a/src/main/java/com/comandante/creeper/command/commands/WhoCommand.java
+++ b/src/main/java/com/comandante/creeper/command/commands/WhoCommand.java
@@ -1,14 +1,13 @@
 package com.comandante.creeper.command.commands;
 
 import com.comandante.creeper.managers.GameManager;
-import com.comandante.creeper.model.Player;
 import com.google.common.collect.ImmutableList;
 
 public class WhoCommand extends Command {
 
-    private final static String helpDescription = "List players currently logged in to server.";
+    private final static String helpDescription = "List who you are.";
     public final static ImmutableList validTriggers = new ImmutableList.Builder<String>().add(
-            "whoami".toLowerCase()
+            "who".toLowerCase()
     ).build();
     private final static boolean isCaseSensitiveTriggers = false;
 
@@ -18,7 +17,6 @@ public class WhoCommand extends Command {
 
     @Override
     public void run() {
-        Player player = getGameManager().getPlayerManager().getPlayer(getPlayerId());
-        player.getChannel().write(player.getPlayerName() + "\r\n");
+        getGameManager().who(getGameManager().getPlayerManager().getPlayer(getPlayerId()));
     }
 }
diff --git a/src/main/java/com/comandante/creeper/command/commands/WhoamiCommand.java b/src/main/java/com/comandante/creeper/command/commands/WhoamiCommand.java
index 063c062a90259214b775f8fbe5e0f14420c514ad..2dd82b9b0783fb81446e21a2ae563b28b3e31365 100644
--- a/src/main/java/com/comandante/creeper/command/commands/WhoamiCommand.java
+++ b/src/main/java/com/comandante/creeper/command/commands/WhoamiCommand.java
@@ -1,13 +1,14 @@
 package com.comandante.creeper.command.commands;
 
 import com.comandante.creeper.managers.GameManager;
+import com.comandante.creeper.model.Player;
 import com.google.common.collect.ImmutableList;
 
 public class WhoamiCommand extends Command {
 
-    private final static String helpDescription = "List who you are.";
+    private final static String helpDescription = "List players currently logged in to server.";
     public final static ImmutableList validTriggers = new ImmutableList.Builder<String>().add(
-            "who".toLowerCase()
+            "whoami".toLowerCase()
     ).build();
     private final static boolean isCaseSensitiveTriggers = false;
 
@@ -17,6 +18,7 @@ public class WhoamiCommand extends Command {
 
     @Override
     public void run() {
-
+        Player player = getGameManager().getPlayerManager().getPlayer(getPlayerId());
+        player.getChannel().write(player.getPlayerName() + "\r\n");
     }
 }