3 files changed, 13 insertions, 13 deletions
diff --git a/modules/nickserv/nickserv.cpp b/modules/nickserv/nickserv.cpp
index 1718af690..d38119d69 100644
--- a/modules/nickserv/nickserv.cpp
+++ b/modules/nickserv/nickserv.cpp
@@ -195,7 +195,7 @@ public:
 
 		if (!na->nc->HasExt("KILL_IMMED"))
 		{
-			u->SendMessage(NickServ, NICK_IS_SECURE, Config->StrictPrivmsg.c_str(), NickServ->nick.c_str());
+			u->SendMessage(NickServ, NICK_IS_SECURE, NickServ->GetQueryCommand().c_str());
 		}
 		if (na->nc->HasExt("KILLPROTECT"))
 		{
@@ -362,8 +362,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%s SET EMAIL \037email\037\002 in order to set your email."),
-				Config->StrictPrivmsg.c_str(), NickServ->nick.c_str());
+			u->SendMessage(NickServ, _("Type \002%s SET EMAIL \037email\037\002 in order to set your email."),
+				NickServ->GetQueryCommand().c_str());
 		}
 
 		for (auto *c : collides)
@@ -465,15 +465,15 @@ public:
 			source.Reply(_("\002%s\002 allows you to register a nickname and\n"
 				"prevent others from using it. The following\n"
 				"commands allow for registration and maintenance of\n"
-				"nicknames; to use them, type \002%s%s \037command\037\002.\n"
+				"nicknames; to use them, type \002%s \037command\037\002.\n"
 				"For more information on a specific command, type\n"
-				"\002%s%s %s \037command\037\002.\n"), NickServ->nick.c_str(), Config->StrictPrivmsg.c_str(), NickServ->nick.c_str(), Config->StrictPrivmsg.c_str(), NickServ->nick.c_str(), source.command.c_str());
+				"\002%s %s \037command\037\002.\n"), NickServ->nick.c_str(), NickServ->GetQueryCommand().c_str(), NickServ->GetQueryCommand().c_str(), 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%s \037command\037\002.\n"
+				"accounts; to use them, type \002%s \037command\037\002.\n"
 				"For more information on a specific command, type\n"
-				"\002%s%s %s \037command\037\002.\n"), NickServ->nick.c_str(), Config->StrictPrivmsg.c_str(), NickServ->nick.c_str(), Config->StrictPrivmsg.c_str(), NickServ->nick.c_str(), source.command.c_str());
+				"\002%s %s \037command\037\002.\n"), NickServ->nick.c_str(), NickServ->GetQueryCommand().c_str(), NickServ->GetQueryCommand().c_str(), source.command.c_str());
 		return EVENT_CONTINUE;
 	}
 
diff --git a/modules/nickserv/ns_drop.cpp b/modules/nickserv/ns_drop.cpp
index 6042bf326..5a31d74f9 100644
--- a/modules/nickserv/ns_drop.cpp
+++ b/modules/nickserv/ns_drop.cpp
@@ -72,8 +72,8 @@ public:
 				*code = Anope::Random(15);
 			}
 
-			source.Reply(CONFIRM_DROP, na->nick.c_str(), Config->StrictPrivmsg.c_str(),
-				source.service->nick.c_str(), na->nick.c_str(), code->c_str());
+			source.Reply(CONFIRM_DROP, na->nick.c_str(), source.service->GetQueryCommand().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 25c4e5a0d..f8391a519 100644
--- a/modules/nickserv/ns_set.cpp
+++ b/modules/nickserv/ns_set.cpp
@@ -57,8 +57,8 @@ public:
 			}
 		}
 
-		source.Reply(_("Type \002%s%s HELP %s \037option\037\002 for more information\n"
-			"on a specific option."), Config->StrictPrivmsg.c_str(), source.service->nick.c_str(), this_name.c_str());
+		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());
 
 		return true;
 	}
@@ -100,9 +100,9 @@ public:
 			}
 		}
 
-		source.Reply(_("Type \002%s%s HELP %s \037option\037\002 for more information\n"
+		source.Reply(_("Type \002%s HELP %s \037option\037\002 for more information\n"
 				"on a specific option. The options will be set on the given\n"
-				"\037nickname\037."), Config->StrictPrivmsg.c_str(), source.service->nick.c_str(), this_name.c_str());
+				"\037nickname\037."), source.service->GetQueryCommand().c_str(), this_name.c_str());
 		return true;
 	}
 };