diff --git a/src/authentic2/utils.py b/src/authentic2/utils.py
index cd2828fed..616be58f5 100644
--- a/src/authentic2/utils.py
+++ b/src/authentic2/utils.py
@@ -908,6 +908,9 @@ def select_next_url(request, default, field_name=None, include_post=False, repla
     '''Select the first valid next URL'''
     next_url = (include_post and get_next_url(request.POST, field_name=field_name)) or get_next_url(request.GET, field_name=field_name)
     if good_next_url(request, next_url):
+        if replace:
+            for key, value in replace.items():
+                next_url = next_url.replace(key, urlparse.quote(value))
         return next_url
     return default