diff --git a/application/src/org/yaaic/command/CommandParser.java b/application/src/org/yaaic/command/CommandParser.java
index f2aae27..02014b4 100644
--- a/application/src/org/yaaic/command/CommandParser.java
+++ b/application/src/org/yaaic/command/CommandParser.java
@@ -166,12 +166,14 @@ public class CommandParser
     public void handleClientCommand(String type, String[] params, Server server, Conversation conversation, IRCService service)
     {
         BaseHandler command = null;
+
         if (commands.containsKey(type.toLowerCase())) {
-            command = commands.get(type);
+            command = commands.get(type.toLowerCase());
         } else if (aliases.containsKey(type.toLowerCase())) {
             String commandInCommands = aliases.get(type.toLowerCase());
             command = commands.get(commandInCommands);
         }
+
         try {
             command.execute(params, server, conversation, service);
         } catch(CommandException e) {