diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp
index f9fd13c9..96257c4a 100644
--- a/modules/webadmin.cpp
+++ b/modules/webadmin.cpp
@@ -971,6 +971,10 @@ public:
 			Tmpl["StatusPrefix"] = CZNC::Get().GetStatusPrefix();
 			Tmpl["ISpoofFile"] = CZNC::Get().GetISpoofFile();
 			Tmpl["ISpoofFormat"] = CZNC::Get().GetISpoofFormat();
+			Tmpl["MaxBufferSize"] = CString(CZNC::Get().GetMaxBufferSize());
+			Tmpl["ConnectDelay"] = CString(CZNC::Get().GetConnectDelay());
+			Tmpl["ServerThrottle"] = CString(CZNC::Get().GetServerThrottle());
+			Tmpl["AnonIPLimit"] = CString(CZNC::Get().GetAnonIPLimit());
 
 			const VCString& vsBindHosts = CZNC::Get().GetBindHosts();
 			for (unsigned int a = 0; a < vsBindHosts.size(); a++) {
@@ -1059,7 +1063,10 @@ public:
 		sArg = WebSock.GetParam("statusprefix"); CZNC::Get().SetStatusPrefix(sArg);
 		sArg = WebSock.GetParam("ispooffile"); CZNC::Get().SetISpoofFile(sArg);
 		sArg = WebSock.GetParam("ispoofformat"); CZNC::Get().SetISpoofFormat(sArg);
-		//sArg = GetParam(""); if (!sArg.empty()) { CZNC::Get().Set(sArg); }
+		sArg = WebSock.GetParam("maxbufsize"); CZNC::Get().SetMaxBufferSize(sArg.ToUInt());
+		sArg = WebSock.GetParam("connectdelay"); CZNC::Get().SetConnectDelay(sArg.ToUInt());
+		sArg = WebSock.GetParam("serverthrottle"); CZNC::Get().SetServerThrottle(sArg.ToUInt());
+		sArg = WebSock.GetParam("anoniplimit"); CZNC::Get().SetAnonIPLimit(sArg.ToUInt());
 
 		VCString vsArgs;
 		WebSock.GetRawParam("motd").Split("\n", vsArgs);
diff --git a/modules/webadmin/tmpl/settings.tmpl b/modules/webadmin/tmpl/settings.tmpl
index a553a169..2e575637 100644
--- a/modules/webadmin/tmpl/settings.tmpl
+++ b/modules/webadmin/tmpl/settings.tmpl
@@ -78,6 +78,30 @@
 				</div>
 				<div style="clear: both;"></div>
 
+				<div class="subsection half">
+					<div class="inputlabel">Maximum Buffer Size:</div>
+					<div><input type="text" name="maxbufsize" value="<? VAR MaxBufferSize ?>" /></div>
+				</div>
+				<div style="clear: both;"></div>
+
+				<div class="subsection half">
+					<div class="inputlabel">Connect Delay:</div>
+					<div><input type="text" name="connectdelay" value="<? VAR ConnectDelay ?>" /></div>
+				</div>
+				<div style="clear: both;"></div>
+
+				<div class="subsection half">
+					<div class="inputlabel">Server Throttle:</div>
+					<div><input type="text" name="serverthrottle" value="<? VAR ServerThrottle ?>" /></div>
+				</div>
+				<div style="clear: both;"></div>
+
+				<div class="subsection half">
+					<div class="inputlabel">Anonymous IP Limit:</div>
+					<div><input type="text" name="anoniplimit" value="<? VAR AnonIPLimit ?>" /></div>
+				</div>
+				<div style="clear: both;"></div>
+
 				<div class="subsection twothird">
 					<div class="inputlabel">MOTD:</div>
 					<div><textarea name="motd" cols="70" rows="5" class="monospace"><? LOOP MOTDLoop ?><? VAR Line ?>