diff --git a/src/main/java/fr/xephi/authme/command/executable/HelpCommand.java b/src/main/java/fr/xephi/authme/command/executable/HelpCommand.java
index 793803e5..a41ffb8d 100644
--- a/src/main/java/fr/xephi/authme/command/executable/HelpCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/HelpCommand.java
@@ -43,8 +43,9 @@ public class HelpCommand extends ExecutableCommand {
             }
         }
 
+        int mappedCommandLevel = foundCommandResult.getCommandDescription().getLabelCount();
         PermissionsManager permissionsManager = Wrapper.getInstance().getAuthMe().getPermissionsManager();
-        List<String> lines = arguments.size() == 1
+        List<String> lines = (mappedCommandLevel == 1)
             ? HelpProvider.printHelp(foundCommandResult, HelpProvider.SHOW_CHILDREN)
             : HelpProvider.printHelp(foundCommandResult, sender, permissionsManager, HelpProvider.ALL_OPTIONS);
         for (String line : lines) {
diff --git a/src/main/java/fr/xephi/authme/command/help/HelpProvider.java b/src/main/java/fr/xephi/authme/command/help/HelpProvider.java
index 37bbb9e5..a36039b8 100644
--- a/src/main/java/fr/xephi/authme/command/help/HelpProvider.java
+++ b/src/main/java/fr/xephi/authme/command/help/HelpProvider.java
@@ -112,7 +112,7 @@ public final class HelpProvider {
 
     private static void printAlternatives(CommandDescription command, List<String> correctLabels, List<String> lines) {
         // TODO ljacqu 20151219: Need to show alternatives for base labels too? E.g. /r for /register
-        if (command.getLabels().size() <= 1) {
+        if (command.getLabels().size() <= 1 || correctLabels.size() <= 1) {
             return;
         }