diff --git a/modules/data/webadmin/tmpl/add_edit_user.tmpl b/modules/data/webadmin/tmpl/add_edit_user.tmpl
index 487c4176..dc1a56cb 100644
--- a/modules/data/webadmin/tmpl/add_edit_user.tmpl
+++ b/modules/data/webadmin/tmpl/add_edit_user.tmpl
@@ -226,11 +226,11 @@
 	</div>
 
 	<div class="section">
-		<h3>Default Settings For New Future Channels</h3>
+		<h3>Default Settings</h3>
 		<div class="sectionbg">
 			<div class="sectionbody">
 				<div class="subsection third">
-					<div class="inputlabel">Modes:</div>
+					<div class="inputlabel">Channel Modes:</div>
 					<input type="text" name="chanmodes" value="<? VAR DefaultChanModes ?>" maxlength="32"
 						   title="These are the default modes ZNC will set when you join an empty channel." />
 					<br /><span class="info">Empty = use standard value</span>
@@ -296,6 +296,11 @@
 					<input type="number" name="maxnetworks" value="<? VAR MaxNetworks ?>" class="third" min="0"
 					       title="Maximum number of IRC networks allowed for this user." <? IF !ImAdmin ?>disabled="disabled"<? ENDIF ?> />
 				</div>
+				<div class="subsection">
+					<div class="inputlabel">Max Query Buffers:</div>
+					<input type="number" name="maxquerybuffers" value="<? VAR MaxQueryBuffers ?>" class="third" min="0"
+					       title="Maximum number of query buffers. 0 is unlimited."/>
+				</div>
 				<div class="subsection half">
 					<div class="inputlabel">CTCP Replies:</div>
 					<div><textarea name="ctcpreplies" cols="70" rows="3"><? LOOP CTCPLoop ?><? VAR CTCP ?>
diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp
index 3ce2637f..cf162a37 100644
--- a/modules/webadmin.cpp
+++ b/modules/webadmin.cpp
@@ -278,6 +278,8 @@ public:
 		pNewUser->SetTimezone(WebSock.GetParam("timezone"));
 		pNewUser->SetJoinTries(WebSock.GetParam("jointries").ToUInt());
 		pNewUser->SetMaxJoins(WebSock.GetParam("maxjoins").ToUInt());
+		pNewUser->SetAutoClearQueryBuffer(WebSock.GetParam("autoclearquerybuffer").ToBool());
+		pNewUser->SetMaxQueryBuffers(WebSock.GetParam("maxquerybuffers").ToUInt());
 
 		if (spSession->IsAdmin()) {
 			pNewUser->SetDenyLoadMod(WebSock.GetParam("denyloadmod").ToBool());
@@ -1106,6 +1108,7 @@ public:
 				Tmpl["JoinTries"] = CString(pUser->JoinTries());
 				Tmpl["MaxNetworks"] = CString(pUser->MaxNetworks());
 				Tmpl["MaxJoins"] = CString(pUser->MaxJoins());
+				Tmpl["MaxQueryBuffers"] = CString(pUser->MaxQueryBuffers());
 
 				const set<CString>& ssAllowedHosts = pUser->GetAllowedHosts();
 				for (set<CString>::const_iterator it = ssAllowedHosts.begin(); it != ssAllowedHosts.end(); ++it) {
@@ -1290,6 +1293,12 @@ public:
 				if (pUser && pUser->DenySetBindHost()) { o11["Checked"] = "true"; }
 			}
 
+			CTemplate& o12 = Tmpl.AddRow("OptionLoop");
+			o12["Name"] = "autoclearquerybuffer";
+			o12["DisplayName"] = "Auto Clear Query Buffer";
+			o12["Tooltip"] = "Automatically Clear Query Buffer After Playback";
+			if (!pUser || pUser->AutoClearQueryBuffer()) { o12["Checked"] = "true"; }
+
 			FOR_EACH_MODULE(i, pUser) {
 				CTemplate& mod = Tmpl.AddRow("EmbeddedModuleLoop");
 				mod.insert(Tmpl.begin(), Tmpl.end());