diff --git a/src/znc.cpp b/src/znc.cpp
index a3ea2fbc..92c3ff35 100644
--- a/src/znc.cpp
+++ b/src/znc.cpp
@@ -524,7 +524,7 @@ CString CZNC::MakeConfigHeader() {
 		"// WARNING\n"
 		"//\n"
 		"// Do NOT edit this file while ZNC is running!\n"
-		"// Use webadmin or *admin instead.\n"
+		"// Use webadmin or *controlpanel instead.\n"
 		"//\n"
 		"// Buf if you feel risky, you might want to read help on /znc saveconfig and /znc rehash.\n"
 		"// Also check http://en.znc.in/wiki/Configuration\n";
@@ -956,7 +956,7 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
 }
 
 size_t CZNC::FilterUncommonModules(set<CModInfo>& ssModules) {
-	const char* ns[] = { "webadmin", "admin",
+	const char* ns[] = { "webadmin", "controlpanel",
 		"chansaver", "keepnick", "simple_away", "partyline",
 		"kickrejoin", "nickserv", "perform" };
 	const set<CString> ssNames(ns, ns + sizeof(ns) / sizeof(ns[0]));