diff --git a/share/html/Admin/CustomFields/index.html b/share/html/Admin/CustomFields/index.html
index 002b295..d326234 100644
--- a/share/html/Admin/CustomFields/index.html
+++ b/share/html/Admin/CustomFields/index.html
@@ -82,7 +82,7 @@
 % }
 </select>
 <br />
-<input type="checkbox" class="checkbox" name="ShowDisabled" value="1" <% $ShowDisabled && 'checked="checked"' %> />
+<input type="checkbox" class="checkbox" name="ShowDisabled" value="1" <% $ShowDisabled && 'checked="checked"' |n%> />
 <&|/l&>Include disabled custom fields in listing.</&>
 <br />
 
diff --git a/share/html/Admin/Queues/Modify.html b/share/html/Admin/Queues/Modify.html
index 237ff64..ba88c2d 100755
--- a/share/html/Admin/Queues/Modify.html
+++ b/share/html/Admin/Queues/Modify.html
@@ -102,14 +102,14 @@
 % }
 
 % if ( RT->Config->Get('GnuPG')->{'Enable'} ) {
-<tr><td align="right"><input type="checkbox" class="checkbox" name="Sign" value="1" <% $QueueObj->Sign? 'checked="checked"': '' %> /></td>
+<tr><td align="right"><input type="checkbox" class="checkbox" name="Sign" value="1" <% $QueueObj->Sign? 'checked="checked"': '' |n%> /></td>
 <td><&|/l&>Sign by default</&></td>
-<td align="right"><input type="checkbox" class="checkbox" name="Encrypt" value="1" <% $QueueObj->Encrypt? 'checked="checked"': '' %> /></td>
+<td align="right"><input type="checkbox" class="checkbox" name="Encrypt" value="1" <% $QueueObj->Encrypt? 'checked="checked"': '' |n%> /></td>
 <td><&|/l&>Encrypt by default</&></td>
 </tr>
 % }
 
-<tr><td align="right"><input type="checkbox" class="checkbox" name="Enabled" value="1" <%$EnabledChecked%> /></td>
+<tr><td align="right"><input type="checkbox" class="checkbox" name="Enabled" value="1" <%$EnabledChecked|n%> /></td>
 <td colspan="3"><&|/l&>Enabled (Unchecking this box disables this queue)</&><br />
 % $m->callback( %ARGS, QueueObj => $QueueObj, results => \@results );
 </td></tr>
diff --git a/share/html/Admin/Queues/index.html b/share/html/Admin/Queues/index.html
index 8cf8678..7eab165 100755
--- a/share/html/Admin/Queues/index.html
+++ b/share/html/Admin/Queues/index.html
@@ -68,7 +68,7 @@
 &>
 % }
 <form method="post" action="<% RT->Config->Get('WebPath') %>/Admin/Queues/index.html">
-<input type="checkbox" class="checkbox" name="FindDisabledQueues" value="1" <% $FindDisabledQueues? 'checked="checked"': '' %> />
+<input type="checkbox" class="checkbox" name="FindDisabledQueues" value="1" <% $FindDisabledQueues? 'checked="checked"': '' |n%> />
 <&|/l&>Include disabled queues in listing.</&>
 <div align="right"><input type="submit" class="button" value="<&|/l&>Go!</&>" /></div> 
 </form>
diff --git a/share/html/Elements/SelectBoolean b/share/html/Elements/SelectBoolean
index fec7cbc..fc2bf36 100755
--- a/share/html/Elements/SelectBoolean
+++ b/share/html/Elements/SelectBoolean
@@ -46,8 +46,8 @@
 %# 
 %# END BPS TAGGED BLOCK }}}
 <select name="<%$Name%>">
-<option value="<%$TrueVal%>" <%$TrueDefault%>><%$True%></option>
-<option value="<%$FalseVal%>" <%$FalseDefault%>><%$False%></option>
+<option value="<%$TrueVal%>" <%$TrueDefault|n%>><%$True%></option>
+<option value="<%$FalseVal%>" <%$FalseDefault|n%>><%$False%></option>
 </select>
 
 <%ARGS>
diff --git a/share/html/Elements/SelectMatch b/share/html/Elements/SelectMatch
index 4569e48..77532d3 100755
--- a/share/html/Elements/SelectMatch
+++ b/share/html/Elements/SelectMatch
@@ -46,10 +46,10 @@
 %# 
 %# END BPS TAGGED BLOCK }}}
 <select name="<%$Name%>">
-<option value="LIKE" <%$LikeDefault%>><%$Like%></option>
-<option value="NOT LIKE" <%$NotLikeDefault%>><%$NotLike%></option>
-<option value="=" <%$TrueDefault%>><%$True%></option>
-<option value="!=" <%$FalseDefault%>><%$False%></option>
+<option value="LIKE" <%$LikeDefault|n%>><%$Like%></option>
+<option value="NOT LIKE" <%$NotLikeDefault|n%>><%$NotLike%></option>
+<option value="=" <%$TrueDefault|n%>><%$True%></option>
+<option value="!=" <%$FalseDefault|n%>><%$False%></option>
 </select>
 
 <%ARGS>
diff --git a/share/html/Elements/SelectResultsPerPage b/share/html/Elements/SelectResultsPerPage
index 4d49023..bbf746a 100755
--- a/share/html/Elements/SelectResultsPerPage
+++ b/share/html/Elements/SelectResultsPerPage
@@ -49,7 +49,7 @@
 
 <select name="<% $Name %>">
 % foreach my $value ( @values ) {
-<option value="<% $value %>" <% $value == $Default? 'selected="selected"': '' %>>
+<option value="<% $value %>" <% $value == $Default? 'selected="selected"': '' |n%>>
 <% shift @labels %>
 </option>
 % }
diff --git a/share/html/Search/Elements/SelectGroupBy b/share/html/Search/Elements/SelectGroupBy
index 35b22f9..2b37186 100644
--- a/share/html/Search/Elements/SelectGroupBy
+++ b/share/html/Search/Elements/SelectGroupBy
@@ -53,7 +53,7 @@ $Query   => ''
 <select name="<% $Name %>">
 % while (@options) {
 % my ($text, $value) = (shift @options, shift @options);
-<option value="<% $value %>" <% $value eq $Default ? 'selected="selected"' : '' %>><% loc($text) %></option>
+<option value="<% $value %>" <% $value eq $Default ? 'selected="selected"' : '' |n%>><% loc($text) %></option>
 % }
 </select>
 <%init>