3 files changed, 8 insertions, 7 deletions
diff --git a/modules/commands/bs_set.cpp b/modules/commands/bs_set.cpp
index ccd1bb615..2591ca5a5 100644
--- a/modules/commands/bs_set.cpp
+++ b/modules/commands/bs_set.cpp
@@ -177,7 +177,7 @@ class CommandBSSet : public Command
 					this->OnSyntaxError(source, "MSG");
 			}
 			else
-				source.Reply(UNKNOWN_OPTION, option.c_str(), Config->UseStrictPrivMsgString.c_str(), source.owner->nick.c_str(), this->name.c_str());
+				this->OnSyntaxError(source, "");
 		}
 
 		return;
@@ -284,9 +284,11 @@ class CommandBSSet : public Command
 		else if (subcommand.equals_ci("GREET"))
 			this->SendSyntax(source, "\037channel\037 GREET {\037ON|OFF\037}");
 		else if (subcommand.equals_ci("MSG"))
-			this->SendSyntax(source, "\037botname\037 NOBOT {\037ON|OFF\037}");
+			this->SendSyntax(source, "\037channel\037 MSG {\037ON|OFF\037}");
 		else if (subcommand.equals_ci("NOBOT"))
-			this->SendSyntax(source, "\037botname\037 NOBOT {\037ON|OFF\037}");
+			this->SendSyntax(source, "\037channel\037 NOBOT {\037ON|OFF\037}");
+		else
+			this->OnSyntaxError(source, "");
 	}
 };
 
diff --git a/modules/commands/ms_set.cpp b/modules/commands/ms_set.cpp
index 1aa3f469d..b1bda8339 100644
--- a/modules/commands/ms_set.cpp
+++ b/modules/commands/ms_set.cpp
@@ -62,7 +62,7 @@ class CommandMSSet : public Command
 			source.Reply(_("%s will not send you any notification of memos."), Config->MemoServ.c_str());
 		}
 		else
-			this->OnSyntaxError(source, param);
+			this->OnSyntaxError(source, "");
 
 		return;
 	}
@@ -219,8 +219,7 @@ class CommandMSSet : public Command
 			return this->DoLimit(source, params, mi);
 		else
 		{
-			source.Reply(NICK_SET_UNKNOWN_OPTION, Config->UseStrictPrivMsgString.c_str(), cmd.c_str());
-			source.Reply(MORE_INFO, Config->UseStrictPrivMsgString.c_str(), source.owner->nick.c_str(), "SET");
+			this->OnSyntaxError(source, "");
 		}
 
 		return;
diff --git a/modules/commands/os_set.cpp b/modules/commands/os_set.cpp
index abee78e77..340b463ea 100644
--- a/modules/commands/os_set.cpp
+++ b/modules/commands/os_set.cpp
@@ -189,7 +189,7 @@ class CommandOSSet : public Command
 		else if (option.equals_ci("NOEXPIRE"))
 			return this->DoSetNoExpire(source, params);
 		else
-			source.Reply(_("Unknown option \002%s\002."), option.c_str());
+			this->OnSyntaxError(source, "");
 
 		return;
 	}