lib/codereview/codereview.py | 4 +++-

diff --git a/lib/codereview/codereview.py b/lib/codereview/codereview.py
index 3376f0736401d286cf5f263318aedc626c9255b9..bed002b9f7f0e5f936f08809d60aa64ec78bf6d8 100644
--- a/lib/codereview/codereview.py
+++ b/lib/codereview/codereview.py
@@ -1351,7 +1351,9 @@ 		return None, None, "CL has no author"
 
 	# The author is just a nickname: get the real email address.
 	try:
-		data = MySend("/user_popup/" + nick, force_auth=False)
+		# want URL-encoded nick, but without a=, and rietveld rejects + for %20.
+		url = "/user_popup/" + urllib.urlencode({"a": nick})[2:].replace("+", "%20")
+		data = MySend(url, force_auth=False)
 	except:
 		ui.warn("error looking up %s: %s\n" % (nick, ExceptionDetail()))
 		cl.original_author = nick+"@needtofix"