diff --git a/modules/www/webadmin/add_edit_chan.tmpl b/modules/www/webadmin/add_edit_chan.tmpl
index 5fd2bcd3..5acc593d 100644
--- a/modules/www/webadmin/add_edit_chan.tmpl
+++ b/modules/www/webadmin/add_edit_chan.tmpl
@@ -3,8 +3,8 @@
 <form action="<? IF Edit ?>editchan<? ELSE ?>addchan<? ENDIF ?>" method="post">
 	<div class="section">
 		<input type="hidden" name="submitted" value="1" />
-		<input type="hidden" name="user" value="<? VAR User ESC=HTML ?>" />
-		<? IF Edit ?><input type="hidden" name="name" value="<? VAR ChanName ESC=HTML ?>" /><? ENDIF ?>
+		<input type="hidden" name="user" value="<? VAR User ?>" />
+		<? IF Edit ?><input type="hidden" name="name" value="<? VAR ChanName ?>" /><? ENDIF ?>
 
 		<h3>Channel Info</h3>
 		<div class="sectionbg">
@@ -19,12 +19,12 @@
 
 				<div class="subsection">
 					<div class="inputlabel">Buffer Count:</div>
-					<div><input type="text" name="buffercount" value="<? VAR BufferCount ESC=HTML ?>" size="10" /></div>
+					<div><input type="text" name="buffercount" value="<? VAR BufferCount ?>" size="10" /></div>
 				</div>
 
 				<div class="subsection">
 					<div class="inputlabel">Default Modes:</div>
-					<div><input type="text" name="defmodes" value="<? VAR DefModes ESC=HTML ?>" size="10" /></div>
+					<div><input type="text" name="defmodes" value="<? VAR DefModes ?>" size="10" /></div>
 				</div>
 
 			</div>
@@ -41,8 +41,8 @@
 				</span>
 				<? LOOP OptionLoop ?>
 				<span class="checkboxandlabel">
-					<input type="checkbox" name="<? VAR Name ESC=HTML ?>" id="opt_<? VAR Name ESC=HTML ?>" value="true"<? IF Checked ?> checked="checked"<? ENDIF ?><? IF Disabled ?> disabled="disabled"<? ENDIF ?> />
-					<label for="opt_<? VAR Name ESC=HTML ?>"><? VAR DisplayName ESC=HTML ?></label>
+					<input type="checkbox" name="<? VAR Name ?>" id="opt_<? VAR Name ?>" value="true"<? IF Checked ?> checked="checked"<? ENDIF ?><? IF Disabled ?> disabled="disabled"<? ENDIF ?> />
+					<label for="opt_<? VAR Name ?>"><? VAR DisplayName ?></label>
 				</span>
 				<? ENDLOOP ?>
 				<div style="clear:both;"></div>
diff --git a/modules/www/webadmin/add_edit_user.tmpl b/modules/www/webadmin/add_edit_user.tmpl
index 447d0b02..5bf50c26 100644
--- a/modules/www/webadmin/add_edit_user.tmpl
+++ b/modules/www/webadmin/add_edit_user.tmpl
@@ -11,10 +11,10 @@
 					<div class="inputlabel">Username:</div>
 					<div>
 						<? IF Edit ?>
-						<input type="hidden" name="user" value="<? VAR Username ESC=HTML ?>" />
-						<input type="text" name="newuser" value="<? VAR Username ESC=HTML ?>" class="half" maxlength="128" disabled="disabled" />
+						<input type="hidden" name="user" value="<? VAR Username ?>" />
+						<input type="text" name="newuser" value="<? VAR Username ?>" class="half" maxlength="128" disabled="disabled" />
 						<? ELSE ?>
-						<input type="text" name="user" value="<? VAR Username ESC=HTML ?>" class="half" maxlength="128" />
+						<input type="text" name="user" value="<? VAR Username ?>" class="half" maxlength="128" />
 						<? ENDIF ?>
 					</div>
 				</div>
@@ -28,7 +28,7 @@
 				</div>
 				<div class="subsection half">
 					<div class="inputlabel">Allowed IPs:</div>
-					<textarea name="allowedips" cols="70" rows="5"><? LOOP AllowedHostLoop ?><? VAR Host ESC=HTML ?>
+					<textarea name="allowedips" cols="70" rows="5"><? LOOP AllowedHostLoop ?><? VAR Host ?>
 <? ENDLOOP ?>
 </textarea>
 					<br /><span class="info">Leave empty to allow connections from all IPs.<br />
@@ -48,25 +48,25 @@
 			<div class="sectionbody">
 				<div class="subsection">
 					<div class="inputlabel">Nickname:</div>
-					<div><input type="text" name="nick" value="<? VAR Nick ESC=HTML ?>" class="half" maxlength="128" /></div>
+					<div><input type="text" name="nick" value="<? VAR Nick ?>" class="half" maxlength="128" /></div>
 				</div>
 				<div class="subsection">
 					<div class="inputlabel">Alt. Nickname:</div>
-					<div><input type="text" name="altnick" value="<? VAR AltNick ESC=HTML ?>" class="half" maxlength="128" /></div>
+					<div><input type="text" name="altnick" value="<? VAR AltNick ?>" class="half" maxlength="128" /></div>
 				</div>
 				<div style="clear: both;"></div>
 				<div class="subsection">
 					<div class="inputlabel">Ident:</div>
-					<div><input type="text" name="ident" value="<? VAR Ident ESC=HTML ?>" class="half" maxlength="128" /></div>
+					<div><input type="text" name="ident" value="<? VAR Ident ?>" class="half" maxlength="128" /></div>
 				</div>
 				<div class="subsection">
 					<div class="inputlabel">StatusPrefix:</div>
-					<div><input type="text" name="statusprefix" value="<? VAR StatusPrefix ESC=HTML ?>" class="half" maxlength="5" /></div>
+					<div><input type="text" name="statusprefix" value="<? VAR StatusPrefix ?>" class="half" maxlength="5" /></div>
 				</div>
 				<div style="clear: both;"></div>
 				<div class="subsection">
 					<div class="inputlabel">Realname:</div>
-					<div><input type="text" name="realname" value="<? VAR RealName ESC=HTML ?>" class="full" maxlength="256" /></div>
+					<div><input type="text" name="realname" value="<? VAR RealName ?>" class="full" maxlength="256" /></div>
 				</div>
 				<div style="clear: both;"></div>
 
@@ -75,7 +75,7 @@
 					<div class="inputlabel">VHost:</div>
 					<select name="vhost">
 						<option value="">- Default -</option>
-						<? LOOP VHostLoop ?><option value="<? VAR VHost ESC=HTML ?>"<? IF Checked ?> selected="selected"<? ENDIF ?>><? VAR VHost ESC=HTML ?></option><? ENDLOOP ?>
+						<? LOOP VHostLoop ?><option value="<? VAR VHost ?>"<? IF Checked ?> selected="selected"<? ENDIF ?>><? VAR VHost ?></option><? ENDLOOP ?>
 					</select>
 				</div>
 				<div style="clear: both;"></div>
@@ -83,13 +83,13 @@
 
 				<div class="subsection">
 					<div class="inputlabel">Quit Message:</div>
-					<div><input type="text" name="quitmsg" value="<? VAR QuitMsg ESC=HTML ?>" class="full" maxlength="256" /></div>
+					<div><input type="text" name="quitmsg" value="<? VAR QuitMsg ?>" class="full" maxlength="256" /></div>
 				</div>
 				<div style="clear: both;"></div>
 
 				<div class="subsection half">
 					<div class="inputlabel">Servers:</div>
-					<div><textarea name="servers" cols="70" rows="5"><? LOOP ServerLoop ?><? VAR Server ESC=HTML ?>
+					<div><textarea name="servers" cols="70" rows="5"><? LOOP ServerLoop ?><? VAR Server ?>
 <? ENDLOOP ?>
 </textarea></div>
 					<br /><span class="info">One server per line, host [+]port[ password]</span>
@@ -124,12 +124,12 @@
 				<? LOOP ModuleLoop ?>
 					<tr class="<? IF __EVEN__ ?>evenrow<? ELSE ?>oddrow<? ENDIF ?>">
 						<td class="mod_name">
-							<input type="checkbox" name="loadmod" id="lm_<? VAR Name ESC=HTML ?>" value="<? VAR Name ESC=HTML ?>"<? IF Checked ?> checked="checked"<? ENDIF ?><? IF Disabled ?> disabled="disabled"<? ENDIF ?> /><label for="lm_<? VAR Name ESC=HTML ?>"> <? VAR Name ESC=HTML ?></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 ?>"> <? VAR Name ?></label>
 						</td>
 						<td class="mod_args">
-							<? IF Disabled ?><? VAR Args ESC=HTML ?><? ELSE ?><input class="third" type="text" name="modargs_<? VAR Name ESC=HTML ?>" value="<? VAR Args ESC=HTML ?>" /><? ENDIF ?>
+							<? IF Disabled ?><? VAR Args ?><? ELSE ?><input class="third" type="text" name="modargs_<? VAR Name ?>" value="<? VAR Args ?>" /><? ENDIF ?>
 						</td>
-						<td class="mod_descr"><? VAR Description ESC=HTML ?></td>
+						<td class="mod_descr"><? VAR Description ?></td>
 					</tr>
 				<? ENDLOOP ?>
 
@@ -167,15 +167,15 @@
 			<? LOOP ChannelLoop ?>
 					<tr class="<? IF __EVEN__ ?>evenrow<? ELSE ?>oddrow<? ENDIF ?>">
 						<td>
-							<input type="hidden" name="channel" value="<? VAR Name ESC=HTML ?>" />
+							<input type="hidden" name="channel" value="<? VAR Name ?>" />
 							[<a href="editchan?user=<? VAR Username ESC=URL ?>&amp;name=<? VAR Name ESC=URL ?>">Edit</a>] [<a href="delchan?user=<? VAR Username ESC=URL ?>&amp;name=<? VAR Name ESC=URL ?>">Del</a>]
 						</td>
-						<td><input type="checkbox" name="save_<? VAR Name ESC=HTML ?>"<? IF InConfig ?> checked="checked"<? ENDIF ?> /></td>
-						<td><? VAR Name ESC=HTML ?></td>
-						<td><? VAR CurModes ESC=HTML ?></td>
-						<td><? VAR DefModes ESC=HTML ?></td>
-						<td><? VAR BufferCount ESC=HTML ?></td>
-						<td><? VAR Options ESC=HTML ?></td>
+						<td><input type="checkbox" name="save_<? VAR Name ?>"<? IF InConfig ?> checked="checked"<? ENDIF ?> /></td>
+						<td><? VAR Name ?></td>
+						<td><? VAR CurModes ?></td>
+						<td><? VAR DefModes ?></td>
+						<td><? VAR BufferCount ?></td>
+						<td><? VAR Options ?></td>
 					</tr>
 			<? ENDLOOP ?>
 					</tbody>
@@ -191,12 +191,12 @@
 			<div class="sectionbody">
 				<div class="subsection third">
 					<div class="inputlabel">Modes:</div>
-					<div><input type="text" name="chanmodes" value="<? VAR DefaultChanModes ESC=HTML ?>" maxlength="32" /></div>
+					<div><input type="text" name="chanmodes" value="<? VAR DefaultChanModes ?>" maxlength="32" /></div>
 					<br /><span class="info">Empty = use standard value</span>
 				</div>
 				<div class="subsection third">
 					<div class="inputlabel">Buffer Size:</div>
-					<div><input type="text" name="bufsize" value="<? VAR BufferCount ESC=HTML ?>" maxlength="9" /></div>
+					<div><input type="text" name="bufsize" value="<? VAR BufferCount ?>" maxlength="9" /></div>
 					<br /><span class="info">Empty = use standard value</span>
 				</div>
 			</div>
@@ -209,8 +209,8 @@
 			<div class="sectionbody lotsofcheckboxes">
 				<? LOOP OptionLoop ?>
 				<span class="checkboxandlabel">
-					<input type="checkbox" name="<? VAR Name ESC=HTML?>" id="opt_<? VAR Name ESC=HTML ?>" value="1"<? IF Checked ?> checked="checked"<? ENDIF ?><? IF Disabled ?> disabled="disabled"<? ENDIF ?> />
-					<label for="opt_<? VAR Name ESC=HTML ?>"><? VAR DisplayName ESC=HTML ?></label>
+					<input type="checkbox" name="<? VAR Name ?>" id="opt_<? VAR Name ?>" value="1"<? IF Checked ?> checked="checked"<? ENDIF ?><? IF Disabled ?> disabled="disabled"<? ENDIF ?> />
+					<label for="opt_<? VAR Name ?>"><? VAR DisplayName ?></label>
 				</span>
 				<? ENDLOOP ?>
 				<div style="clear:both;"></div>
@@ -225,23 +225,23 @@
 			<div class="sectionbody">
 				<div class="subsection">
 					<div class="inputlabel">Timestamp Format:</div>
-					<div><input type="text" name="timestampformat" value="<? VAR TimestampFormat ESC=HTML ?>" class="half" /></div>
+					<div><input type="text" name="timestampformat" value="<? VAR TimestampFormat ?>" class="half" /></div>
 				</div>
 				<div class="subsection">
 					<div class="inputlabel">Timezone Offset:</div>
-					<div><input type="text" name="timezoneoffset" value="<? VAR TimezoneOffset ESC=HTML ?>" class="third" /></div>
+					<div><input type="text" name="timezoneoffset" value="<? VAR TimezoneOffset ?>" class="third" /></div>
 				</div>
 				<div class="subsection">
 					<div class="inputlabel">Join Tries:</div>
-					<div><input type="text" name="jointries" value="<? VAR JoinTries ESC=HTML ?>" class="third" /></div>
+					<div><input type="text" name="jointries" value="<? VAR JoinTries ?>" class="third" /></div>
 				</div>
 				<div class="subsection">
 					<div class="inputlabel">Max Joins:</div>
-					<div><input type="text" name="maxjoins" value="<? VAR MaxJoins ESC=HTML ?>" class="third" /></div>
+					<div><input type="text" name="maxjoins" value="<? VAR MaxJoins ?>" class="third" /></div>
 				</div>
 				<div class="subsection half">
 					<div class="inputlabel">CTCP Replies:</div>
-					<div><textarea name="ctcpreplies" cols="70" rows="3"><? LOOP CTCPLoop ?><? VAR CTCP ESC=HTML ?>
+					<div><textarea name="ctcpreplies" cols="70" rows="3"><? LOOP CTCPLoop ?><? VAR CTCP ?>
 <? ENDLOOP ?>
 </textarea></div>
 					<br /><span class="info">One reply per line. Example: TIME Buy a watch!</span>
diff --git a/modules/www/webadmin/listusers.tmpl b/modules/www/webadmin/listusers.tmpl
index 5c3c104c..048d2aa6 100644
--- a/modules/www/webadmin/listusers.tmpl
+++ b/modules/www/webadmin/listusers.tmpl
@@ -23,10 +23,10 @@
 								<? IF !IsSelf ?>[<a href="deluser?user=<?VAR Username ESC=URL?>" onClick="return confirm('Do you really wish to remove this user?');">Delete</a>]<? ENDIF ?>
 							</span>
 						</td>
-						<td><? VAR Username ESC=HTML ?></td>
-						<td><? VAR Clients ESC=HTML ?></td>
-						<td><? VAR Server ESC=HTML DEFAULT="-N/A-" ?></td>
-						<td><? VAR IRCNick ESC=HTML ?></td>
+						<td><? VAR Username ?></td>
+						<td><? VAR Clients ?></td>
+						<td><? VAR Server DEFAULT="-N/A-" ?></td>
+						<td><? VAR IRCNick ?></td>
 					</tr>
 			<?ENDLOOP?>
 					</tbody>
diff --git a/modules/www/webadmin/settings.tmpl b/modules/www/webadmin/settings.tmpl
index fc59eac1..82f05581 100644
--- a/modules/www/webadmin/settings.tmpl
+++ b/modules/www/webadmin/settings.tmpl
@@ -22,8 +22,8 @@
 							<tbody>
 							<? LOOP ListenLoop ?>
 								<tr class="<? IF __EVEN__ ?>evenrow<? ELSE ?>oddrow<? ENDIF ?>">
-									<td><? VAR Port ESC=HTML ?></td>
-									<td><? VAR BindHost ESC=HTML DEFAULT=** ?></td>
+									<td><? VAR Port ?></td>
+									<td><? VAR BindHost DEFAULT=** ?></td>
 									<td><? IF IsSSL ?>Yes<? ELSE ?>No<? ENDIF ?></td>
 									<td><? IF IsIPV4 ?>Yes<? ELSE ?>No<? ENDIF ?></td>
 									<td><? IF IsIPV6 ?>Yes<? ELSE ?>No<? ENDIF ?></td>
@@ -47,7 +47,7 @@
 					<div>
 						<select name="skin">
 							<? LOOP SkinLoop ?>
-							<option value="<? VAR Name ESC=HTML ?>"<? IF Checked ?> selected="selected"<? ENDIF ?>><? IF Name == "_default_" ?>Default<? ELSE ?><? VAR Name ?><? ENDIF ?></option>
+							<option value="<? VAR Name ?>"<? IF Checked ?> selected="selected"<? ENDIF ?>><? IF Name == "_default_" ?>Default<? ELSE ?><? VAR Name ?><? ENDIF ?></option>
 							<? ENDLOOP ?>
 						</select>
 					</div>
@@ -56,26 +56,26 @@
 
 				<div class="subsection third">
 					<div class="inputlabel">Status Prefix:</div>
-					<div><input type="text" name="statusprefix" value="<? VAR StatusPrefix ESC=HTML ?>" /></div>
+					<div><input type="text" name="statusprefix" value="<? VAR StatusPrefix ?>" /></div>
 					<br /><span class="info">Default for new users only.</span>
 				</div>
 				<div style="clear: both;"></div>
 
 				<div class="subsection half">
 					<div class="inputlabel">ISpoofFile:</div>
-					<div><input type="text" name="ispooffile" value="<? VAR ISpoofFile ESC=HTML ?>" /></div>
+					<div><input type="text" name="ispooffile" value="<? VAR ISpoofFile ?>" /></div>
 					<br /><span class="info">Example: ~/.oidentd.conf</span>
 				</div>
 
 				<div class="subsection half">
 					<div class="inputlabel">ISpoofFormat:</div>
-					<div><input type="text" name="ispoofformat" value="<? VAR ISpoofFormat ESC=HTML ?>" /></div>
+					<div><input type="text" name="ispoofformat" value="<? VAR ISpoofFormat ?>" /></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 ESC=HTML ?>
+					<div><textarea name="motd" cols="70" rows="5" class="monospace"><? LOOP MOTDLoop ?><? VAR Line ?>
 <? ENDLOOP ?>
 </textarea></div>
 					<br /><span class="info">"Message of the Day", sent to all ZNC users on connect.</span>
@@ -83,7 +83,7 @@
 
 				<div class="subsection twothird">
 					<div class="inputlabel">VHosts:</div>
-					<div><textarea name="vhosts" cols="70" rows="8"><? LOOP VHostLoop ?><? VAR VHost ESC=HTML ?>
+					<div><textarea name="vhosts" cols="70" rows="8"><? LOOP VHostLoop ?><? VAR VHost ?>
 <? ENDLOOP ?>
 </textarea></div>
 					<br /><span class="info">One host name or IP entry per line.</span>
@@ -108,9 +108,9 @@
 					<tbody>
 					<? LOOP ModuleLoop ?>
 					<tr class="<? IF __EVEN__ ?>evenrow<? ELSE ?>oddrow<? ENDIF ?>">
-						<td class="mod_name"><input type="checkbox" name="loadmod" id="lm_<? VAR Name ESC=HTML ?>" value="<? VAR Name ESC=HTML ?>"<? IF Checked ?> checked="checked"<? ENDIF ?><? IF Disabled ?> disabled="disabled"<? ENDIF ?> /><label for="lm_<? VAR Name ESC=HTML ?>"> <? VAR Name ESC=HTML ?></label></td>
-						<td class="mod_args"><input type="text" name="modargs_<? VAR Name ESC=HTML ?>" value="<? VAR Args ESC=HTML ?>" /></td>
-						<td class="mod_descr"><? VAR Description ESC=HTML ?></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 ?>"> <? VAR Name ?></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>
 					<? ENDLOOP ?>
 					</tbody>