diff --git a/src/mod/irc.mod/irc.c b/src/mod/irc.mod/irc.c
index 5f6fa81cc..b718397cc 100644
--- a/src/mod/irc.mod/irc.c
+++ b/src/mod/irc.mod/irc.c
@@ -1230,7 +1230,6 @@ static void do_nettype_irc()
   }
   /* Update all rfc_ function pointers */
   add_hook(HOOK_RFC_CASECMP, (Function) (intptr_t) rfc_compliant);
-  do_nettype_server();
 }
 
 static char *traced_nettype(ClientData cdata, Tcl_Interp *irp,
@@ -1292,6 +1291,7 @@ static char *traced_nettype(ClientData cdata, Tcl_Interp *irp,
         "listed in the current configuration file from the source directory\n");
   }
   do_nettype_irc();
+  do_nettype_server();
   return NULL;
 }
 
diff --git a/src/mod/server.mod/server.c b/src/mod/server.mod/server.c
index 8ef3b2b33..08cbeb541 100644
--- a/src/mod/server.mod/server.c
+++ b/src/mod/server.mod/server.c
@@ -74,8 +74,8 @@ static int exclusive_binds;     /* configures PUBM and MSGM binds to be
 static int answer_ctcp;         /* answer how many stacked ctcp's ? */
 static int lowercase_ctcp;      /* answer lowercase CTCP's (non-standard) */
 static int check_mode_r;        /* check for IRCnet +r modes */
-static char net_type[9];
-static int net_type_int;
+static char net_type[9] = "EFnet";
+static int net_type_int = NETT_EFNET;
 static char connectserver[121]; /* what, if anything, to do before connect
                                  * to the server */
 static int resolvserv;          /* in the process of resolving a server host */
@@ -2212,7 +2212,6 @@ char *server_start(Function *global_funcs)
   check_mode_r = 0;
   maxqmsg = 300;
   burst = 0;
-  strlcpy(net_type, "EFnet", sizeof net_type);
   double_mode = 0;
   double_server = 0;
   double_help = 0;
@@ -2322,5 +2321,6 @@ char *server_start(Function *global_funcs)
   newserver[0] = 0;
   newserverport = 0;
   curserv = 999;
+  do_nettype_server();
   return NULL;
 }