diff --git a/doc/config/gib/ln.gib b/doc/config/gib/ln.gib
index f29e2be0f..7e7b33310 100644
--- a/doc/config/gib/ln.gib
+++ b/doc/config/gib/ln.gib
@@ -25,3 +25,13 @@ function::export ln
 // QuakeForge		qwcl
 ln "in_mouse_amp"	"sensitivity"
 ln "in_grab"		"_windowed_mouse"
+ln "con_alpha"		"gl_conalpha"
+ln "con_width"		"vid_conwidth"
+ln "con_height"		"vid_conheight"
+
+// QuakeForge		Old QuakeForge
+ln "hud_fps"		"show_fps"
+ln "hud_time"		"shot_time"
+ln "hud_ping"		"show_ping"
+ln "hud_pl"		"show_pl"
+ln "hud_scoreboard_uid"	"show_scoreuid"
diff --git a/include/r_cvar.h b/include/r_cvar.h
index e7ec33feb..4c011484f 100644
--- a/include/r_cvar.h
+++ b/include/r_cvar.h
@@ -13,7 +13,6 @@ extern struct cvar_s     *d_mipscale;
 
 extern struct cvar_s     *gl_affinemodels;
 extern struct cvar_s     *gl_clear;
-extern struct cvar_s     *gl_conalpha;
 extern struct cvar_s     *gl_conspin;
 extern struct cvar_s     *gl_constretch;
 extern struct cvar_s     *gl_dlight_polyblend;
diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c
index 8e07b4e10..1354887e2 100644
--- a/qw/source/cl_main.c
+++ b/qw/source/cl_main.c
@@ -1765,18 +1765,18 @@ Host_Init (void)
 
 	Con_Printf ("\nClient version %s (build %04d)\n\n", VERSION,
 				build_number ());
-
 	Con_Printf ("\x80\x81\x81\x82 %s initialized \x80\x81\x81\x82\n", PROGRAM);
+
 	CL_UpdateScreen (realtime);
 	Con_NewMap ();							// force the menus to be loaded
 	CL_UpdateScreen (realtime);
-
 	CL_UpdateScreen (realtime);
 
-	Cbuf_AddText (cl_cbuf,
-				  "echo Type connect <internet address> or use a server "
-				  "browser to connect to a game.\n");
-	Cbuf_AddText (cl_cbuf, "cmd_warncmd 1\n");
+	if (connect_time == -1 {
+		Cbuf_AddText (cl_cbuf, "echo Type connect <internet address> or use a "
+					  "server browser to connect to a game.\n");
+	}
+	Cbuf_AddText (cl_cbuf, "set cmd_warncmd 1\n");
 }
 
 void