diff --git a/ChangeLog b/ChangeLog
index c9bfdc87..5e8da50f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,10 @@ v0.61.2		11-Jul-2004
 	mbout:
 		Changed to use direct instead of immediate mail.
 
+	mbsetup:
+		In menu 2, added 3 checks to see if enough info is entered to
+		make a valid network setup.
+
 	mbtask:
 		Changed to use direct instead of immediate mail.
 
diff --git a/mbsetup/m_fido.c b/mbsetup/m_fido.c
index e9e3d11e..d1a25f56 100644
--- a/mbsetup/m_fido.c
+++ b/mbsetup/m_fido.c
@@ -292,7 +292,21 @@ int EditFidoRec(int Area)
 
 	j = select_menu(17);
 	switch(j) {
-	    case 0: crc1 = 0xffffffff;
+	    case 0: if (fidonet.available && fidonet.deleted)
+			fidonet.available = FALSE;
+		    if (fidonet.available && (strlen(fidonet.domain) == 0)) {
+			errmsg("You must fill in a valid domain name");
+			break;
+		    }
+		    if (fidonet.available && (fidonet.zone[0] == 0)) {
+			errmsg("The network must have a main zone number");
+			break;
+		    }
+		    if (fidonet.available && (strlen(fidonet.nodelist) == 0)) {
+			errmsg("You must fill in a nodelist for this network");
+			break;
+		    }
+		    crc1 = 0xffffffff;
 		    crc1 = upd_crc32((char *)&fidonet, crc1, sizeof(fidonet));
 		    if (crc != crc1) {
 			if (yes_no((char *)"Record is changed, save") == 1) {