diff --git a/lib/mbselib.h b/lib/mbselib.h
index d1f182d3..4772f363 100644
--- a/lib/mbselib.h
+++ b/lib/mbselib.h
@@ -1101,9 +1101,9 @@ struct	sysconfig {
 	unsigned	xNoITN		: 1;
 	unsigned	xNoIFC		: 1;
 
-	char		Phone[21];		/* Default phonenumber	    */
-	unsigned long	Speed;			/* Default linespeed	    */
-	char		Flags[31];		/* Default EMSI flags	    */
+	char		IP_Phone[21];		/* TCP/IP phonenumber	    */
+	unsigned long	IP_Speed;		/* TCP/IP linespeed	    */
+	char		IP_Flags[31];		/* TCP/IP EMSI flags	    */
 	int		Req_Files;		/* Maximum files request    */
 	int		Req_MBytes;		/* Maximum MBytes request   */
 	char		extra5[96];
diff --git a/mbfido/msgutil.c b/mbfido/msgutil.c
index 5d998f64..f3539338 100644
--- a/mbfido/msgutil.c
+++ b/mbfido/msgutil.c
@@ -165,6 +165,11 @@ long Msg_Top(char *template, int language, fidoaddr aka)
 	    fread(&ttyinfohdr, sizeof(ttyinfohdr), 1, fp);
 
 	    MacroVars("pqrf", "dsss", 0, "", "", "");
+	    if (strlen(CFG.Flags)) {
+		MacroVars("pqrf", "dsds", 2, CFG.Phone, CFG.Speed, CFG.Flags);
+		fseek(fi, fileptr, SEEK_SET);
+		Msg_Macro(fi);
+	    }
 	    while (fread(&ttyinfo, ttyinfohdr.recsize, 1, fp) == 1) {
 		if (((ttyinfo.type == POTS) || (ttyinfo.type == ISDN)) && ttyinfo.available && strlen(ttyinfo.phone)) {
 		    MacroVars("pqrf", "dsss", ttyinfo.type, ttyinfo.phone, ttyinfo.speed, ttyinfo.flags);