diff --git a/modules/controlpanel.cpp b/modules/controlpanel.cpp
index 6cb947b6..dde0dda1 100644
--- a/modules/controlpanel.cpp
+++ b/modules/controlpanel.cpp
@@ -1130,4 +1130,4 @@ template<> void TModInfo<CAdminMod>(CModInfo& Info) {
 	Info.SetWikiPage("admin");
 }
 
-USERMODULEDEFS(CAdminMod, "Dynamic configuration of users/settings through IRC. Allows editing only yourself if you're not ZNC admin.")
+USERMODULEDEFS(CAdminMod, "Dynamic configuration through IRC. Allows editing only yourself if you're not ZNC admin.")
diff --git a/src/User.cpp b/src/User.cpp
index db507844..48684ccb 100644
--- a/src/User.cpp
+++ b/src/User.cpp
@@ -371,6 +371,12 @@ bool CUser::ParseConfig(CConfig* pConfig, CString& sError) {
 			continue;
 		}
 
+		// XXX Legacy crap, added in ZNC 0.207
+		if (sModName == "admin") {
+			CUtils::PrintMessage("NOTICE: [admin] module was renamed, loading [controlpanel] instead");
+			sModName = "controlpanel";
+		}
+
 		CUtils::PrintAction("Loading Module [" + sModName + "]");
 		CString sModRet;
 		CString sArgs = sValue.Token(1, true);