diff --git a/templates/mod/ban_form.html b/templates/mod/ban_form.html
index 6c7560ad..98cc34b2 100644
--- a/templates/mod/ban_form.html
+++ b/templates/mod/ban_form.html
@@ -21,7 +21,7 @@
 			</th>
 			<td>
 				{% if not hide_ip %}
-					<input type="text" name="ip" id="ip" size="30" maxlength="40" value="{{ ip }}">
+					<input type="text" name="ip" id="ip" size="30" maxlength="40" value="{{ ip|e }}">
 				{% else %}
 					<em>{% trans 'hidden' %}</em>
 				{% endif %}
diff --git a/templates/mod/view_ip.html b/templates/mod/view_ip.html
index 1c1c7fa6..4bacc7f6 100644
--- a/templates/mod/view_ip.html
+++ b/templates/mod/view_ip.html
@@ -45,7 +45,7 @@
 						</td>
 						{% if mod|hasPermission(config.mod.remove_notes) %}
 							<td class="minimal">
-								<a href="?/IP/{{ ip }}/remove_note/{{ note.id }}">
+								<a href="?/IP/{{ ip|url_encode(true) }}/remove_note/{{ note.id }}">
 									<small>[{% trans 'remove' %}]</small>
 								</a>
 							</td>