diff --git a/src/de/steamwar/bungeecore/commands/WhoisCommand.java b/src/de/steamwar/bungeecore/commands/WhoisCommand.java
index 83caa0f..9e25ad2 100644
--- a/src/de/steamwar/bungeecore/commands/WhoisCommand.java
+++ b/src/de/steamwar/bungeecore/commands/WhoisCommand.java
@@ -44,7 +44,7 @@ public class WhoisCommand extends SWCommand {
     }
 
     @Register(description = "WHOIS_USAGE")
-    public void genericCommand(ProxiedPlayer player, @Mapper("player") String target, @OptionalValue("") @StaticValue({"-all", "-a", ""}) String displayAll) {
+    public void genericCommand(ProxiedPlayer player, @Mapper("player") String target, @OptionalValue("") @StaticValue(value = {"", "-all", "-a"}, allowISE = true) boolean all) {
         SteamwarUser user = SteamwarUser.get(target);
         if (user == null) {
             try {
@@ -64,11 +64,9 @@ public class WhoisCommand extends SWCommand {
 
         if (user == null) {
             Message.send("UNKNOWN_PLAYER", player);
-            return;
+        } else {
+            sendUserinfo(player, user, all);
         }
-
-        boolean all = displayAll.contains("-");
-        sendUserinfo(player, user, all);
     }
 
     @Mapper(value = "player", local = true)