diff --git a/ChangeLog b/ChangeLog
index 82e08008..3e7a6974 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,10 @@ v0.61.0		06-Jun-2004.
 		The filenames in the html pages are now the long filenames.
 		This fixes download problems with some mangled 8.3 filenames.
 
+	mbsetup:
+		In mail and files group edit screens, to make an area active
+		existing connections check is skipped.
+
 
 v0.60.0         09-Feb-2004 - 04-Jun-2004
 
diff --git a/mbsetup/m_fgroup.c b/mbsetup/m_fgroup.c
index b0f751f9..6a99e508 100644
--- a/mbsetup/m_fgroup.c
+++ b/mbsetup/m_fgroup.c
@@ -434,7 +434,7 @@ int EditFGrpRec(int Area)
 		case 11:strncpy(fgroup.AnnGroup, PickNGroup((char *)"8.4.18"), 12);
 			FgScreen();
 			break;
-		case 12:if (CheckFgroup())
+		case 12:if (fgroup.Active && CheckFgroup())
 			    break;
 			E_BOOL(17,16,   fgroup.Active,     "Is this file group ^active^")
 		case 13:if (CheckFgroup())
diff --git a/mbsetup/m_mgroup.c b/mbsetup/m_mgroup.c
index 134d5605..6e263141 100644
--- a/mbsetup/m_mgroup.c
+++ b/mbsetup/m_mgroup.c
@@ -405,7 +405,7 @@ int EditMGrpRec(int Area)
 	    case 10:E_BOOL(16,16,    mgroup.UsrDelete,  "Allow users to ^Delete^ their messages")
 	    case 11:E_BOOL(17,16,    mgroup.Aliases,    "Allow ^Aliases^ or real names only")
 	    case 12:E_BOOL(18,16,    mgroup.Quotes,     "Allow random ^quotes^ to new messages")
-	    case 13:if (CheckMgroup())
+	    case 13:if (mgroup.Active && CheckMgroup())
 		        break;
 		    E_BOOL(19,16,    mgroup.Active,     "Is this message group ^active^")
 	    case 14:if (CheckMgroup())