Index: src/core/ss_help.c
===================================================================
--- src/core/ss_help.c	(revision 361)
+++ src/core/ss_help.c	(working copy)
@@ -64,7 +64,7 @@
         if (is_stats_admin(u))
             notice_help(s_StatServ, u, STAT_HELP_ADMIN_CMD);
 #endif
-        moduleDisplayHelp(5, u);
+        moduleDisplayHelp(1, u);
     } else {
         if (!BadChar(av[0])) {
             mod_help_cmd(s_StatServ, u, STATSERV, av[0]);
Index: src/modules.c
===================================================================
--- src/modules.c	(revision 361)
+++ src/modules.c	(working copy)
@@ -2637,6 +2637,7 @@
         p2 = cmdcurrent->help_param2;
         p3 = cmdcurrent->help_param3;
         p4 = cmdcurrent->help_param4;
+        mod_current_module_name = cmdcurrent->mod_name;
         if (cmdcurrent->helpmsg_all >= 0) {
             notice_help(service, u, cmdcurrent->helpmsg_all, p1, p2, p3,
                         p4);
Index: src/moduleapi.c
===================================================================
--- src/moduleapi.c	(revision 361)
+++ src/moduleapi.c	(working copy)
@@ -401,6 +401,8 @@
         for (modcurrent = MODULE_HASH[idx]; modcurrent;
              modcurrent = modcurrent->next) {
             if ((service == 1) && modcurrent->m->operHelp) {
+                mod_current_module_name = modcurrent->name;
+                mod_current_module = modcurrent->m;
                 if (header_shown == 0) {
                     notice_lang(s_StatServ, u, MODULE_HELP_HEADER);
                     header_shown = 1;