diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp
index d0b43c74..f9fd13c9 100644
--- a/modules/webadmin.cpp
+++ b/modules/webadmin.cpp
@@ -506,6 +506,7 @@ public:
 				Tmpl["ChanName"] = pChan->GetName();
 				Tmpl["BufferCount"] = CString(pChan->GetBufferCount());
 				Tmpl["DefModes"] = pChan->GetDefaultModes();
+				Tmpl["Key"] = pChan->GetKey();
 
 				if (pChan->InConfig()) {
 					Tmpl["InConfig"] = "true";
@@ -564,6 +565,7 @@ public:
 		pChan->SetDefaultModes(WebSock.GetParam("defmodes"));
 		pChan->SetInConfig(WebSock.GetParam("save").ToBool());
 		pChan->SetKeepBuffer(WebSock.GetParam("keepbuffer").ToBool());
+		pChan->SetKey(WebSock.GetParam("key"));
 
 		bool bDetached = WebSock.GetParam("detached").ToBool();
 
diff --git a/modules/webadmin/tmpl/add_edit_chan.tmpl b/modules/webadmin/tmpl/add_edit_chan.tmpl
index 3664f728..a9f6920a 100644
--- a/modules/webadmin/tmpl/add_edit_chan.tmpl
+++ b/modules/webadmin/tmpl/add_edit_chan.tmpl
@@ -14,10 +14,14 @@
 				<div class="subsection half">
 					<div class="inputlabel">Channel Name:</div>
 					<div><input type="text" name="name" value="" /></div>
-					<br /><span class="info">If the channel has a key and you want to save the key, type: #CHAN KEY</span>
 				</div>
 				<? ENDIF ?>
 
+				<div class="subsection">
+					<div class="inputlabel">Key:</div>
+					<div><input type="text" name="key" value="<? VAR Key ?>" size="10" /></div>
+				</div>
+
 				<div class="subsection">
 					<div class="inputlabel">Buffer Count:</div>
 					<div><input type="text" name="buffercount" value="<? VAR BufferCount ?>" size="10" /></div>