diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index d9a74d49..3bee7208 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -535,7 +535,7 @@ static void cmd_quote(const char *data, IRC_SERVER_REC *server)
 {
 	if (server != NULL && !IS_IRC_SERVER(server))
 		return;
-	if (server == NULL)
+	if (server == NULL || server->connect_time == 0)
 		cmd_return_error(CMDERR_NOT_CONNECTED);
 
 	irc_send_cmd(server, data);
@@ -546,7 +546,7 @@ static void cmd_rawquote(const char *data, IRC_SERVER_REC *server)
 {
 	if (server != NULL && !IS_IRC_SERVER(server))
 		return;
-	if (server == NULL)
+	if (server == NULL || server->connect_time == 0)
 		cmd_return_error(CMDERR_NOT_CONNECTED);
 
 	irc_send_cmd_full(server, data, FALSE, FALSE, TRUE);
@@ -901,6 +901,7 @@ void irc_commands_init(void)
 	settings_add_int("misc", "knockout_time", 300);
 	settings_add_str("misc", "wall_format", "[Wall/$0] $1-");
 	settings_add_bool("misc", "kick_first_on_kickban", FALSE);
+        settings_add_bool("misc", "join_auto_chans_on_invite", FALSE);
 
 	knockout_tag = g_timeout_add(KNOCKOUT_TIMECHECK, (GSourceFunc) knockout_timeout, NULL);