diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index ae0faacf..3370e0b1 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -334,7 +334,8 @@ static void sig_message_quit(SERVER_REC *server, const char *nick,
 			if (g_slist_find(windows, window) == NULL) {
 				windows = g_slist_append(windows, window);
 				printformat(server, rec->name, MSGLEVEL_QUITS,
-					    TXT_QUIT, nick, address, reason);
+					    TXT_QUIT, nick, address, reason,
+					    rec->name);
 			}
 		}
 		count++;
@@ -347,7 +348,7 @@ static void sig_message_quit(SERVER_REC *server, const char *nick,
 		QUERY_REC *query = query_find(server, nick);
 		if (query != NULL) {
 			printformat(server, nick, MSGLEVEL_QUITS,
-				    TXT_QUIT, nick, address, reason);
+				    TXT_QUIT, nick, address, reason, "");
 		}
 	}
 
@@ -380,7 +381,7 @@ static void print_nick_change_channel(SERVER_REC *server, const char *channel,
 
 	printformat(server, channel, MSGLEVEL_NICKS,
 		    ownnick ? TXT_YOUR_NICK_CHANGED : TXT_NICK_CHANGED,
-		    oldnick, newnick);
+		    oldnick, newnick, channel);
 }
 
 static void print_nick_change(SERVER_REC *server, const char *newnick,
@@ -428,7 +429,7 @@ static void print_nick_change(SERVER_REC *server, const char *newnick,
 
 	if (!msgprint && ownnick) {
 		printformat(server, NULL, MSGLEVEL_NICKS,
-			    TXT_YOUR_NICK_CHANGED, oldnick, newnick);
+			    TXT_YOUR_NICK_CHANGED, oldnick, newnick, "");
 	}
 }
 
diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index a6f88ba0..fd4dea8d 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -66,13 +66,13 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ "join", "{channick_hilight $0} {chanhost_hilight $1} has joined {channel $2}", 3, { 0, 0, 0 } },
 	{ "part", "{channick $0} {chanhost $1} has left {channel $2} {reason $3}", 4, { 0, 0, 0, 0 } },
 	{ "kick", "{channick $0} was kicked from {channel $1} by {nick $2} {reason $3}", 4, { 0, 0, 0, 0 } },
-	{ "quit", "{channick $0} {chanhost $1} has quit {reason $2}", 3, { 0, 0, 0 } },
+	{ "quit", "{channick $0} {chanhost $1} has quit {reason $2}", 4, { 0, 0, 0, 0 } },
 	{ "quit_once", "{channel $3} {channick $0} {chanhost $1} has quit {reason $2}", 4, { 0, 0, 0, 0 } },
 	{ "invite", "{nick $0} invites you to {channel $1}", 2, { 0, 0 } },
 	{ "new_topic", "{nick $0} changed the topic of {channel $1} to: $2", 3, { 0, 0, 0 } },
 	{ "topic_unset", "Topic unset by {nick $0} on {channel $1}", 2, { 0, 0 } },
-	{ "your_nick_changed", "You're now known as {nick $1}", 2, { 0, 0 } },
-	{ "nick_changed", "{channick $0} is now known as {channick_hilight $1}", 2, { 0, 0 } },
+	{ "your_nick_changed", "You're now known as {nick $1}", 3, { 0, 0, 0 } },
+	{ "nick_changed", "{channick $0} is now known as {channick_hilight $1}", 3, { 0, 0, 0 } },
 	{ "talking_in", "You are now talking in {channel $0}", 1, { 0 } },
 	{ "not_in_channels", "You are not on any channels", 0 },
 	{ "current_channel", "Current channel {channel $0}", 1, { 0 } },