diff --git a/aurweb/templates.py b/aurweb/templates.py
index 48391b4a..a648d5a1 100644
--- a/aurweb/templates.py
+++ b/aurweb/templates.py
@@ -31,7 +31,7 @@ _env.filters["tn"] = l10n.tn
 _env.filters["dt"] = util.timestamp_to_datetime
 _env.filters["as_timezone"] = util.as_timezone
 _env.filters["dedupe_qs"] = util.dedupe_qs
-_env.filters["urlencode"] = quote_plus
+_env.filters["quote_plus"] = quote_plus
 _env.filters["get_vote"] = util.get_vote
 _env.filters["number_format"] = util.number_format
 
diff --git a/aurweb/util.py b/aurweb/util.py
index 860bdd12..494a988d 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -1,4 +1,5 @@
 import base64
+import logging
 import math
 import random
 import re
@@ -18,6 +19,8 @@ from jinja2 import pass_context
 
 import aurweb.config
 
+logger = logging.getLogger(__name__)
+
 
 def make_random_string(length):
     return ''.join(random.choices(string.ascii_lowercase
diff --git a/templates/partials/packages/actions.html b/templates/partials/packages/actions.html
index 346537be..d552f2dd 100644
--- a/templates/partials/packages/actions.html
+++ b/templates/partials/packages/actions.html
@@ -42,12 +42,12 @@
                     </li>
                 {% endif %}
                 <li>
-                    <a href="/login?next={{ request.url.path | urlencode }}">
+                    <a href="/login?next={{ request.url.path | quote_plus }}">
                         {{ "Vote for this package" | tr }}
                     </a>
                 </li>
                 <li>
-                    <a href="/login?next={{ request.url.path | urlencode }}">
+                    <a href="/login?next={{ request.url.path | quote_plus }}">
                         {{ "Enable notifications" | tr }}
                     </a>
                 </li>
@@ -133,7 +133,7 @@
             {% endif %}
             <li>
             {% if not request.user.is_authenticated() %}
-                <a href="/login?next={{ '/pkgbase/%s/request' | format(result.Name) | urlencode }}">
+                <a href="/login?next={{ '/pkgbase/%s/request' | format(result.Name) | quote_plus }}">
                     {{ "Submit Request" | tr }}
                 </a>
             {% else %}
diff --git a/templates/partials/tu/proposal/voters.html b/templates/partials/tu/proposal/voters.html
index 2fd42bdf..6069f97d 100644
--- a/templates/partials/tu/proposal/voters.html
+++ b/templates/partials/tu/proposal/voters.html
@@ -2,7 +2,7 @@
 <ul id="voters">
     {% for voter in voters %}
         <li>
-            <a href="/account/{{ voter.Username | urlencode }}">
+            <a href="/account/{{ voter.Username | quote_plus }}">
                 {{ voter.Username | e }}
             </a>
         </li>
diff --git a/templates/partials/tu/proposals.html b/templates/partials/tu/proposals.html
index 13e705fc..ab90444e 100644
--- a/templates/partials/tu/proposals.html
+++ b/templates/partials/tu/proposals.html
@@ -23,7 +23,7 @@
                     <th>{{ "Proposal" | tr }}</th>
                     <th>
                         {% set off_qs = "%s=%d" | format(off_param, off) %}
-                        {% set by_qs = "%s=%s" | format(by_param, by_next | urlencode) %}
+                        {% set by_qs = "%s=%s" | format(by_param, by_next | quote_plus) %}
                         <a href="?{{ q | dedupe_qs(off_qs, by_qs) }}">
                             {{ "Start" | tr }}
                         </a>
@@ -95,7 +95,7 @@
 
                     {% if off > 0 %}
                         {% set off_qs = "%s=%d" | format(off_param, off - 10) %}
-                        {% set by_qs = "%s=%s" | format(by_param, by | urlencode) %}
+                        {% set by_qs = "%s=%s" | format(by_param, by | quote_plus) %}
                         <a class="page"
                            href="?{{ q | dedupe_qs(off_qs, by_qs) }}">
                             ‹ Back
@@ -104,7 +104,7 @@
 
                     {% if off < total_votes - pp %}
                         {% set off_qs = "%s=%d" | format(off_param, off + 10) %}
-                        {% set by_qs = "%s=%s" | format(by_param, by | urlencode) %}
+                        {% set by_qs = "%s=%s" | format(by_param, by | quote_plus) %}
                         <a class="page"
                            href="?{{ q | dedupe_qs(off_qs, by_qs) }}">
                             Next ›