3 files changed, 13 insertions, 10 deletions
diff --git a/modules/nickserv/nickserv.cpp b/modules/nickserv/nickserv.cpp
index 4221fa114..80ffaf3cc 100644
--- a/modules/nickserv/nickserv.cpp
+++ b/modules/nickserv/nickserv.cpp
@@ -221,7 +221,7 @@ public:
 
 			if (protect)
 			{
-				u->SendMessage(NickServ, NICK_IS_SECURE, NickServ->GetQueryCommand().c_str());
+				u->SendMessage(NickServ, NICK_IS_SECURE, NickServ->GetQueryCommand("nickserv/identify").c_str());
 				u->SendMessage(NickServ, _("If you do not change within %s, I will change your nick."),
 					Anope::Duration(protect, u->Account()).c_str());
 				new NickServCollide(this, this, u, na, protect);
@@ -393,8 +393,8 @@ public:
 			u->SendMessage(NickServ, _("You must now supply an email for your nick.\n"
 							"This email will allow you to retrieve your password in\n"
 							"case you forget it."));
-			u->SendMessage(NickServ, _("Type \002%s SET EMAIL \037email\037\002 in order to set your email."),
-				NickServ->GetQueryCommand().c_str());
+			u->SendMessage(NickServ, _("Type \002%s \037email\037\002 in order to set your email."),
+				NickServ->GetQueryCommand("nickserv/set/email").c_str());
 		}
 
 		for (auto *c : collides)
@@ -498,13 +498,14 @@ public:
 				"commands allow for registration and maintenance of\n"
 				"nicknames; to use them, type \002%s \037command\037\002.\n"
 				"For more information on a specific command, type\n"
-				"\002%s %s \037command\037\002.\n"), NickServ->nick.c_str(), NickServ->GetQueryCommand().c_str(), NickServ->GetQueryCommand().c_str(), source.command.c_str());
+				"\002%s \037command\037\002.\n"), NickServ->nick.c_str(), NickServ->GetQueryCommand().c_str(), NickServ->GetQueryCommand({}, source.command).c_str());
 		else
 			source.Reply(_("\002%s\002 allows you to register an account.\n"
 				"The following commands allow for registration and maintenance of\n"
 				"accounts; to use them, type \002%s \037command\037\002.\n"
 				"For more information on a specific command, type\n"
-				"\002%s %s \037command\037\002.\n"), NickServ->nick.c_str(), NickServ->GetQueryCommand().c_str(), NickServ->GetQueryCommand().c_str(), source.command.c_str());
+				"\002%s \037command\037\002.\n"),
+				NickServ->nick.c_str(), NickServ->GetQueryCommand().c_str(), NickServ->GetQueryCommand({}, source.command.c_str()).c_str());
 		return EVENT_CONTINUE;
 	}
 
diff --git a/modules/nickserv/ns_drop.cpp b/modules/nickserv/ns_drop.cpp
index 1f6aeaad5..a51f5ce58 100644
--- a/modules/nickserv/ns_drop.cpp
+++ b/modules/nickserv/ns_drop.cpp
@@ -72,7 +72,7 @@ public:
 				*code = Anope::Random(Config->GetBlock("options").Get<size_t>("codelength", 15));
 			}
 
-			source.Reply(CONFIRM_DROP, na->nick.c_str(), source.service->GetQueryCommand().c_str(),
+			source.Reply(CONFIRM_DROP, na->nick.c_str(), source.service->GetQueryCommand("nickserv/drop").c_str(),
 				na->nick.c_str(), code->c_str());
 			return;
 		}
diff --git a/modules/nickserv/ns_set.cpp b/modules/nickserv/ns_set.cpp
index 63568c4f1..39da08053 100644
--- a/modules/nickserv/ns_set.cpp
+++ b/modules/nickserv/ns_set.cpp
@@ -57,8 +57,9 @@ public:
 			}
 		}
 
-		source.Reply(_("Type \002%s HELP %s \037option\037\002 for more information\n"
-			"on a specific option."), source.service->GetQueryCommand().c_str(), this_name.c_str());
+		source.Reply(_("Type \002%s \037option\037\002 for more information\n"
+			"on a specific option."),
+			source.service->GetQueryCommand("generic/help", this_name).c_str());
 
 		return true;
 	}
@@ -100,9 +101,10 @@ public:
 			}
 		}
 
-		source.Reply(_("Type \002%s HELP %s \037option\037\002 for more information\n"
+		source.Reply(_("Type \002%s \037option\037\002 for more information\n"
 				"on a specific option. The options will be set on the given\n"
-				"\037nickname\037."), source.service->GetQueryCommand().c_str(), this_name.c_str());
+				"\037nickname\037."),
+			source.service->GetQueryCommand("generic/help", this_name).c_str());
 		return true;
 	}
 };