diff --git a/Modules.cpp b/Modules.cpp
index 1692cbad..f5d26d92 100644
--- a/Modules.cpp
+++ b/Modules.cpp
@@ -963,8 +963,7 @@ bool CModules::GetModPathInfo(CModInfo& ModInfo, const CString& sModule, const C
 		return false;
 
 	if (Info) {
-		ModInfo.SetGlobal(Info->IsGlobal());
-		ModInfo.SetDescription(Info->GetDescription());
+		ModInfo = *Info;
 	}
 	ModInfo.SetName(sModule);
 	ModInfo.SetPath(sModPath);
diff --git a/Modules.h b/Modules.h
index cc495426..8593a462 100644
--- a/Modules.h
+++ b/Modules.h
@@ -191,6 +191,7 @@ public:
 	const CString& GetName() const { return m_sName; }
 	const CString& GetPath() const { return m_sPath; }
 	const CString& GetDescription() const { return m_sDescription; }
+	const CString& GetWikiPage() const { return m_sWikiPage; }
 	bool IsGlobal() const { return m_bGlobal; }
 	ModLoader GetLoader() const { return m_fLoader; }
 	GlobalModLoader GetGlobalLoader() const { return m_fGlobalLoader; }
@@ -200,6 +201,7 @@ public:
 	void SetName(const CString& s) { m_sName = s; }
 	void SetPath(const CString& s) { m_sPath = s; }
 	void SetDescription(const CString& s) { m_sDescription = s; }
+	void SetWikiPage(const CString& s) { m_sWikiPage = s; }
 	void SetGlobal(bool b) { m_bGlobal = b; }
 	void SetLoader(ModLoader fLoader) { m_fLoader = fLoader; }
 	void SetGlobalLoader(GlobalModLoader fGlobalLoader) { m_fGlobalLoader = fGlobalLoader; }
@@ -210,6 +212,7 @@ protected:
 	CString         m_sName;
 	CString         m_sPath;
 	CString         m_sDescription;
+	CString         m_sWikiPage;
 	ModLoader       m_fLoader;
 	GlobalModLoader m_fGlobalLoader;
 };
diff --git a/modules/data/webadmin/tmpl/add_edit_user.tmpl b/modules/data/webadmin/tmpl/add_edit_user.tmpl
index ab489087..ab7c1310 100644
--- a/modules/data/webadmin/tmpl/add_edit_user.tmpl
+++ b/modules/data/webadmin/tmpl/add_edit_user.tmpl
@@ -136,7 +136,7 @@
 				<? LOOP ModuleLoop ?>
 					<tr class="<? IF __EVEN__ ?>evenrow<? ELSE ?>oddrow<? ENDIF ?>">
 						<td class="mod_name">
-							<input type="checkbox" name="loadmod" id="lm_<? VAR Name ?>" value="<? VAR Name ?>"<? IF Checked ?> checked="checked"<? ENDIF ?><? IF Disabled ?> disabled="disabled"<? ENDIF ?> /><label for="lm_<? VAR Name ?>"> <? VAR Name ?></label>
+							<input type="checkbox" name="loadmod" id="lm_<? VAR Name ?>" value="<? VAR Name ?>"<? IF Checked ?> checked="checked"<? ENDIF ?><? IF Disabled ?> disabled="disabled"<? ENDIF ?> /><label for="lm_<? VAR Name ?>"> <? IF Wiki ?><a href="http://wiki.znc.in/<? VAR Wiki ?>"><? VAR Name ?></a> <? ELSE ?> <? VAR Name ?> <? ENDIF ?></label>
 						</td>
 						<td class="mod_args">
 							<? IF Disabled ?><? VAR Args ?><? ELSE ?><input class="third" type="text" name="modargs_<? VAR Name ?>" value="<? VAR Args ?>" /><? ENDIF ?>
diff --git a/modules/data/webadmin/tmpl/settings.tmpl b/modules/data/webadmin/tmpl/settings.tmpl
index e0681d4b..4828267a 100644
--- a/modules/data/webadmin/tmpl/settings.tmpl
+++ b/modules/data/webadmin/tmpl/settings.tmpl
@@ -132,7 +132,7 @@
 					<tbody>
 					<? LOOP ModuleLoop ?>
 					<tr class="<? IF __EVEN__ ?>evenrow<? ELSE ?>oddrow<? ENDIF ?>">
-						<td class="mod_name"><input type="checkbox" name="loadmod" id="lm_<? VAR Name ?>" value="<? VAR Name ?>"<? IF Checked ?> checked="checked"<? ENDIF ?><? IF Disabled ?> disabled="disabled"<? ENDIF ?> /><label for="lm_<? VAR Name ?>"> <? VAR Name ?></label></td>
+						<td class="mod_name"><input type="checkbox" name="loadmod" id="lm_<? VAR Name ?>" value="<? VAR Name ?>"<? IF Checked ?> checked="checked"<? ENDIF ?><? IF Disabled ?> disabled="disabled"<? ENDIF ?> /><label for="lm_<? VAR Name ?>"> <? IF Wiki ?> <a href="http://wiki.znc.in/<? VAR Wiki ?>"><? VAR Name ?></a> <? ELSE ?> <? VAR Name ?> <? ENDIF ?></label></td>
 						<td class="mod_args"><input type="text" name="modargs_<? VAR Name ?>" value="<? VAR Args ?>" /></td>
 						<td class="mod_descr"><? VAR Description ?></td>
 					</tr>
diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp
index bc5e6c1b..543a2221 100644
--- a/modules/webadmin.cpp
+++ b/modules/webadmin.cpp
@@ -745,6 +745,7 @@ public:
 				l["Name"] = Info.GetName();
 				l["Description"] = Info.GetDescription();
 				l["Args"] = GetModArgs(pUser, Info.GetName());
+				l["Wiki"] = Info.GetWikiPage();
 
 				if (pUser && pUser->GetModules().FindModule(Info.GetName())) {
 					l["Checked"] = "true";
@@ -1039,6 +1040,7 @@ public:
 				l["Name"] = Info.GetName();
 				l["Description"] = Info.GetDescription();
 				l["Args"] = GetModArgs(NULL, Info.GetName(), true);
+				l["Wiki"] = Info.GetWikiPage();
 			}
 
 			return true;