diff --git a/Chan.cpp b/Chan.cpp
index 90da1d40..38c9c2bd 100644
--- a/Chan.cpp
+++ b/Chan.cpp
@@ -58,10 +58,14 @@ bool CChan::WriteConfig(CFile& File) {
 
 	File.Write("\t<Chan " + GetName() + ">\r\n");
 
-	File.Write("\t\tBuffer     = " + CString(GetBufferCount()) + "\r\n");
-	File.Write("\t\tKeepBuffer = " + CString((KeepBuffer()) ? "true" : "false") + "\r\n");
-	File.Write("\t\tDetached   = " + CString((IsDetached()) ? "true" : "false") + "\r\n");
-	File.Write("\t\tAutoCycle  = " + CString((AutoCycle()) ? "true" : "false") + "\r\n");
+	if (m_pUser->GetBufferCount() != GetBufferCount())
+		File.Write("\t\tBuffer     = " + CString(GetBufferCount()) + "\r\n");
+	if (m_pUser->KeepBuffer() != KeepBuffer())
+		File.Write("\t\tKeepBuffer = " + CString((KeepBuffer()) ? "true" : "false") + "\r\n");
+	if (IsDetached())
+		File.Write("\t\tDetached   = true\r\n");
+	if (m_pUser->AutoCycle() != AutoCycle())
+		File.Write("\t\tAutoCycle  = " + CString((AutoCycle()) ? "true" : "false") + "\r\n");
 	if (!GetKey().empty()) { File.Write("\t\tKey        = " + GetKey() + "\r\n"); }
 	if (!GetDefaultModes().empty()) { File.Write("\t\tModes      = " + GetDefaultModes() + "\r\n"); }