diff --git a/Chan.cpp b/Chan.cpp
index 711e7122..c603d795 100644
--- a/Chan.cpp
+++ b/Chan.cpp
@@ -40,6 +40,10 @@ void CChan::Reset() {
 }
 
 bool CChan::WriteConfig(CFile& File) {
+	if (!InConfig()) {
+		return false;
+	}
+
 	File.Write("\t<Chan " + GetName() + ">\r\n");
 
 	File.Write("\t\tBuffer     = " + CString::ToString(GetBufferCount()) + "\r\n");
diff --git a/User.cpp b/User.cpp
index 3c35a8b6..dca0bf6a 100644
--- a/User.cpp
+++ b/User.cpp
@@ -400,9 +400,12 @@ bool CUser::WriteConfig(CFile& File) {
 
 	// Chans
 	for (unsigned int c = 0; c < m_vChans.size(); c++) {
-		File.Write("\r\n");
-		if (!m_vChans[c]->WriteConfig(File)) {
-			return false;
+		CChan* pChan = m_vChans[c];
+		if (pChan->InConfig()) {
+			File.Write("\r\n");
+			if (!pChan->WriteConfig(File)) {
+				return false;
+			}
 		}
 	}